Refactor changes from core#926
Merged
dbwiddis merged 5 commits intoopensearch-project:mainfrom Aug 21, 2023
Merged
Conversation
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
owaiskazi19
reviewed
Aug 16, 2023
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
18c5ce9 to
32c02b7
Compare
owaiskazi19
previously approved these changes
Aug 18, 2023
Member
|
Gah! I'm sorry @DarshitChanpura i just updated some of these imports, forgetting you had this PR open. Looks like you covered more than I did, can you rebase this? |
Member
|
Also if you want to throw in standard import ordering to align with recent OpenSearch changes I wouldn't mind. |
Member
Something like the below for spotless: as mentioned here: opensearch-project/OpenSearch#9306 |
…matting standard Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
dbwiddis
approved these changes
Aug 21, 2023
|
The backport to To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/opensearch-sdk-java/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/opensearch-sdk-java/backport-1.x
# Create a new branch
git switch --create backport/backport-926-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6baacae0a9cd4a7ca77a7637a6f9c19ff708c438
# Push it to GitHub
git push --set-upstream origin backport/backport-926-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-sdk-java/backport-1.xThen, create a pull request where the |
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
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.
Description
Pull latest refactor changes from core
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.