-
Notifications
You must be signed in to change notification settings - Fork 300
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.
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
Fix build break from cluster manager changes #1911
Fix build break from cluster manager changes #1911
Conversation
Signed-off-by: Peter Nied <[email protected]>
Thanks for making this fix! But this fix is actually not necessary until 3.0.0, so I've included the fix in the version bump to 3.0.0 PR. |
Codecov Report
@@ Coverage Diff @@
## main #1911 +/- ##
============================================
- Coverage 61.04% 61.01% -0.03%
Complexity 3234 3234
============================================
Files 256 256
Lines 18088 18088
Branches 3224 3224
============================================
- Hits 11041 11037 -4
Misses 5467 5467
- Partials 1580 1584 +4
Continue to review full report at Codecov.
|
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1911-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1a63f228932d90011f2519759143de6cf08c7714
# Push it to GitHub
git push --set-upstream origin backport/backport-1911-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x Then, create a pull request where the |
@DarshitChanpura We don't need to backport this change, I fixed main and 2.x with seperate pull requests, 2.x was resolved with the backport for the build changes, see #1903, commit 4102f3a. |
okay..thank you @peternied ! |
Signed-off-by: Peter Nied <[email protected]> Signed-off-by: Stephen Crawford <[email protected]>
Description
Fix build break from cluster manager changes
Check List
New functionality includes testingNew functionality has been documentedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.