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

Propagate UI changes to 2.1 #6062

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Conversation

kolchfa-aws
Copy link
Collaborator

Propagate UI changes to 2.1

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Fanit Kolchina <[email protected]>
Copy link
Collaborator

@natebower natebower left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kolchfa-aws kolchfa-aws merged commit a548191 into 2.1 Jan 8, 2024
2 of 3 checks passed
@github-actions github-actions bot deleted the backport/backport-6061-to-2.1 branch January 8, 2024 20:57
@kolchfa-aws kolchfa-aws added the backport 2.0 PR: Backport label for v2.0.x label Jan 8, 2024
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.0 failed:

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

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.0 2.0
# Navigate to the new working tree
pushd ../.worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-6062-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a548191d32bc4b06e9300397cbc55861a4d3ca3f
# Push it to GitHub
git push --set-upstream origin backport/backport-6062-to-2.0
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.0

Then, create a pull request where the base branch is 2.0 and the compare/head branch is backport/backport-6062-to-2.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.0 PR: Backport label for v2.0.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants