Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TS-4888: Modified collapsed_forwarding plugin to return TSREMAP_NO_REMAP #1044

Merged
merged 1 commit into from Nov 2, 2016
Merged

TS-4888: Modified collapsed_forwarding plugin to return TSREMAP_NO_REMAP #1044

merged 1 commit into from Nov 2, 2016

Conversation

brkishore
Copy link

TS-4888: This PR is to backport the fix on to 6.2.x branch.

@jpeach
Copy link
Contributor

jpeach commented Sep 23, 2016

[approve ci]

@atsci
Copy link

atsci commented Sep 23, 2016

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/754/ for details.

@atsci
Copy link

atsci commented Sep 23, 2016

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/858/ for details.

@zwoop zwoop added the Plugins label Sep 23, 2016
@zwoop zwoop added this to the 7.1.0 milestone Sep 23, 2016
@pbchou
Copy link
Contributor

pbchou commented Sep 23, 2016

This commit message should say return TSREMAP_NO_REMAP. Also, this is a back-port request to 6.2.x so perhaps the mile-stone should be changed (PR #1042 is the same fix against master).

@brkishore brkishore changed the title TS-4888: Modified collapsed_frowarding plugin to return TSREMAP_DID_R… TS-4888: Modified collapsed_frowarding plugin to return TSREMAP_NO_REMAP Sep 26, 2016
@brkishore brkishore changed the title TS-4888: Modified collapsed_frowarding plugin to return TSREMAP_NO_REMAP TS-4888: Modified collapsed_forwarding plugin to return TSREMAP_NO_REMAP Sep 26, 2016
@jpeach jpeach assigned PSUdaemon and unassigned jpeach Sep 27, 2016
@jpeach jpeach modified the milestones: 6.2.1, 7.1.0 Sep 27, 2016
@PSUdaemon PSUdaemon added the Backport Marked for backport for an LTS patch release label Sep 27, 2016
@PSUdaemon
Copy link
Contributor

Please format this PR as outlined here.

@pbchou
Copy link
Contributor

pbchou commented Nov 1, 2016

@brkishore -- I did the following on my back-port PRs --

  • git checkout <feature-branch-under-6.2.x-branch>
  • git log (to identify SHA1 of the last commit before my commits)
  • git reset --hard
  • git cherry-pick -x
  • git push --force origin <feature-branch-under-6.2.x-branch>

Seems to work without destroying the original PR.

@brkishore
Copy link
Author

Phil, I have done the updates to the PR. Please let me know if this is Okay now.

@PSUdaemon
Copy link
Contributor

[approve ci]

@atsci
Copy link

atsci commented Nov 2, 2016

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/1140/ for details.

@atsci
Copy link

atsci commented Nov 2, 2016

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/1033/ for details.

@PSUdaemon PSUdaemon merged commit fceccb8 into apache:6.2.x Nov 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@PSUdaemon PSUdaemon

Labels
Backport Marked for backport for an LTS patch release Plugins
Projects
No open projects
6.2.x Release
Backport
Milestone
6.2.1
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@brkishore @jpeach @atsci @pbchou @PSUdaemon @zwoop