[hotfix] fix problem caused by concurrent merge #9546
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
Member
|
@sijie please prioritize merging this PR since the master branch is currently broken and this PR fixes it. |
Member
|
/pulsarbot run-failure-checks |
merlimat
approved these changes
Feb 9, 2021
Member
|
/pulsarbot run-failure-checks |
Contributor
|
There appear to still be a test that's failing all the time: https://github.com/apache/pulsar/pull/9546/checks?check_run_id=1864571680 |
sijie
approved these changes
Feb 9, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Motivation
Currently, the master branch is broken due to PR #9444 and #9302 merged concurrently.
This PR fixes this problem.