Skip to content
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

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

Merged
merged 2 commits into from
Oct 13, 2023

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Oct 2, 2023

Backport ee55c5d from #944

@dblock
Copy link
Member

dblock commented Oct 2, 2023

Thanks for doing this for me @dbwiddis

@dblock
Copy link
Member

dblock commented Oct 3, 2023

@dbwiddis care to amend with DCO?

@dbwiddis
Copy link
Member Author

dbwiddis commented Oct 9, 2023

@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 [email protected]", but got "dblock [email protected]".

How do we fix that?

dblock and others added 2 commits October 9, 2023 08:10
…ch-project#946) (opensearch-project#947)

(cherry picked from commit 16d82f2)

Signed-off-by: mend-for-github-com[bot] <mend-for-github-com[bot]@users.noreply.github.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
@dbwiddis
Copy link
Member Author

dbwiddis commented Oct 9, 2023

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!

@dblock dblock merged commit b56e2c3 into opensearch-project:1.x Oct 13, 2023
6 of 7 checks passed
@opensearch-trigger-bot
Copy link

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants