Automated cherry pick of #9415 #9500
Merged
Conversation
This file contains 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: Gyuho Lee <[email protected]>
Signed-off-by: Gyuho Lee <[email protected]>
Signed-off-by: Gyuho Lee <[email protected]>
jpbetz
force-pushed
the
automated-cherry-pick-of-#9415-release-3.1
branch
from
315e177
to
8eeab58
Compare
|
Fixed mistake merge conflict. |
|
Looks like there is some additional code that cannot be cleanly merged, semantically merging it manually now. |
|
@jpbetz Yeah, could have been easier to cherry-pick individual commits or edit directly in the branch :0 This is missing |
|
@gyuho Yep, that auto-merge didn't work out. I've manually applied the changes that didn't auto merge. Everything should be in place now, but please double check me! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 pick of #9415 on release-3.1.
#9415: rafthttp: add "ActivePeers" to "Transport"