-
Notifications
You must be signed in to change notification settings - Fork 94
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 after core #8157 #486
Fix after core #8157 #486
Conversation
Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: bowenlan-amzn <[email protected]>
Signed-off-by: bowenlan-amzn <[email protected]>
Codecov Report
@@ Coverage Diff @@
## main #486 +/- ##
============================================
+ Coverage 74.47% 74.48% +0.01%
+ Complexity 861 859 -2
============================================
Files 129 129
Lines 5598 5597 -1
Branches 684 684
============================================
Hits 4169 4169
+ Misses 1125 1124 -1
Partials 304 304
|
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-486-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-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 |
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.9 2.9
# Navigate to the new working tree
cd .worktrees/backport-2.9
# Create a new branch
git switch --create backport/backport-486-to-2.9
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 003071c50e5cf08f7489f4940e0f1e7092ade1d8
# Push it to GitHub
git push --set-upstream origin backport/backport-486-to-2.9
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.9 Then, create a pull request where the |
core was backported to 2.x, opensearch-project/OpenSearch#8782, we need this backport to 2.x also. I do the manual backport for 2.x, #499 |
* Fix after core #8157 Signed-off-by: bowenlan-amzn <[email protected]> * Fix ktlint issue Signed-off-by: bowenlan-amzn <[email protected]> * Fix spotless java check Signed-off-by: bowenlan-amzn <[email protected]> --------- Signed-off-by: bowenlan-amzn <[email protected]> (cherry picked from commit 003071c)
* Fix after core #8157 Signed-off-by: bowenlan-amzn <[email protected]> * Fix ktlint issue Signed-off-by: bowenlan-amzn <[email protected]> * Fix spotless java check Signed-off-by: bowenlan-amzn <[email protected]> --------- Signed-off-by: bowenlan-amzn <[email protected]> (cherry picked from commit 003071c) Signed-off-by: Hailong Cui <[email protected]>
* Fix after core #8157 * Fix ktlint issue * Fix spotless java check --------- (cherry picked from commit 003071c) Signed-off-by: bowenlan-amzn <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Co-authored-by: bowenlan-amzn <[email protected]>
* Fix after core #8157 * Fix ktlint issue * Fix spotless java check --------- (cherry picked from commit 003071c) Signed-off-by: bowenlan-amzn <[email protected]> Signed-off-by: Hailong Cui <[email protected]> Co-authored-by: bowenlan-amzn <[email protected]> Signed-off-by: AWSHurneyt <[email protected]>
Description
opensearch-project/OpenSearch#8157
Issues Resolved
[List any issues this PR will resolve]
Check List
By 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.