Adjust TCP Keepalive and Errmgr message #3046
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Joshua Hursey <[email protected]> (cherry picked from commit c452f68) Signed-off-by: Joshua Hursey <[email protected]>
Signed-off-by: Joshua Hursey <[email protected]> (cherry picked from commit df0f8e9) Signed-off-by: Joshua Hursey <[email protected]>
|
Since this is a parameter change I think it's only appropriate to pull it into v2.x. I'm happy to file other PRs to the other release branches if folks want. |
jsquyres
approved these changes
Feb 27, 2017
|
@hppritcha These 2 PRs are in v2.0.x, so they should be in v2.1.x as well. |
|
@jsquyres I don't think these are in v2.0.x yet. Do you want me to make a PR over there for them? |
|
@jjhursey Oh! My bad -- I apparently only did this on master and did not PR to v2.0.x. Mmph. Yes, please file a PR for v2.0.x, if you wouldn't mind... |
|
this needs to get into 2.1.x |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry picking these two PRs as they are related: