-
Notifications
You must be signed in to change notification settings - Fork 138
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
Revert Text Block changes from "Enhance validation for create connector API" #3260 #3329
Conversation
…or API" opensearch-project#3260 Text Blcok changes introduced in JDK15. Eventhough our main release is based on JDK21, 2.x is still based on JDK11. So to support autoi bot backport of these test files in the future, reverting Text Block related changes from test cases. Signed-off-by: Abdul Muneer Kolarkunnu <muneer.kolarkunnu@netapp.com>
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-3329-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 bf48f99c76266207438b7c1d49ce0a3861813870
# Push it to GitHub
git push --set-upstream origin backport/backport-3329-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 |
Auto backport failed. @akolarkunnu Can you help manually backport to 2.x ? |
I tried to follow above steps, but failing with permission issue on the second last step(push) git push --set-upstream origin backport/backport-3329-to-2.x |
You can do following:
then resolve the necessary conflict and raise the PR. You might want to include commit id: |
Backporting these two PRs together becasue auto backporting of 3260 failed becasue of usage of Text Blocks, 3329 is to revert the usage of Text Blocks. Signed-off-by: Abdul Muneer Kolarkunnu <muneer.kolarkunnu@netapp.com>
Manual back port PR has been created - #3353 |
Description
Text Block changes introduced in JDK15. Even though our main release is based on JDK21, 2.x is still based on JDK11. So to support auto bot backport of these test files in the future, reverting Text Block related changes from test cases.
Related Issues
Revert Text Block changes from #3260
Check List
New functionality includes testing.New functionality has been documented.API changes companion pull request created.--signoff
.Public documentation issue/PR created.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.