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

Remove #5428 from 2.11.1 release due to conflicts #5491

Merged
merged 1 commit into from
Nov 16, 2023

Conversation

ananzh
Copy link
Member

@ananzh ananzh commented Nov 16, 2023

Description

Due to #5482 (comment) and the closure of #5482, update 2.11.1 release note and add PR back to unreleased section in CHANGELOG.

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

@ananzh ananzh added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Nov 16, 2023
@ananzh ananzh added backport 2.x backport 2.11 docs Improvements or additions to documentation and removed distinguished-contributor labels Nov 16, 2023
@joshuarrrr joshuarrrr added the v2.11.1 Issues targeting release v2.11.1 label Nov 16, 2023
@ananzh ananzh merged commit 791210d into opensearch-project:main Nov 16, 2023
35 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.11 failed:

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

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

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

ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Nov 17, 2023
ananzh added a commit to ananzh/OpenSearch-Dashboards that referenced this pull request Nov 17, 2023
AMoo-Miki pushed a commit that referenced this pull request Nov 17, 2023
AMoo-Miki pushed a commit that referenced this pull request Nov 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x docs Improvements or additions to documentation Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.11.1 Issues targeting release v2.11.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants