opensearch-project / opensearch-sdk-java

OpenSearch SDK to build and run extensions
Apache License 2.0
28 stars 59 forks source link

[Backport 1.x] Updated dev guide with the correct GET route. #948

Closed dbwiddis closed 1 year ago

dbwiddis commented 1 year ago

Backport ee55c5d36854e7b4d8c43afc4dc6b0c0212ccf92 from https://github.com/opensearch-project/opensearch-sdk-java/pull/944

dblock commented 1 year ago

Thanks for doing this for me @dbwiddis

dblock commented 1 year ago

@dbwiddis care to amend with DCO?

dbwiddis commented 1 year ago

@dbwiddis care to amend with DCO?

DCO failure is yours I think? This is just a cherry-pick.

Commit sha: 94b380a, Author: Daniel (dB.) Doubrovkine, Committer: Daniel Widdis; Expected "Daniel (dB.) Doubrovkine dblock@amazon.com", but got "dblock dblock@amazon.com".

How do we fix that?

dbwiddis commented 1 year ago

How do we fix that?

I amended to edit your DCO to match your committer name. Hope that's ok with you as the original signer!

opensearch-trigger-bot[bot] commented 1 year ago

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 128

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-948-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b56e2c3b6957bf74786f4458c60cdd16a8a25dfa
# Push it to GitHub
git push --set-upstream origin backport/backport-948-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/opensearch-sdk-java/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-948-to-1.x.