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 2.x] Adding release notes for new setting #15779

Merged
merged 1 commit into from
Sep 5, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport e892f23 from #15771.

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
(cherry picked from commit e892f23)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@harshavamsi
Copy link
Contributor

Forward port of #15771 from 2.17 to 2.x

@reta reta merged commit e6862cd into 2.x Sep 5, 2024
60 of 61 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

harshavamsi added a commit to harshavamsi/OpenSearch that referenced this pull request Sep 5, 2024
sumitasr pushed a commit to sumitasr/OpenSearch that referenced this pull request Sep 6, 2024
…5779)

(cherry picked from commit e892f23)

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
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>
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.

2 participants