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.15] [Backport 2.x] fix monitor renew lock issue #1628

Merged
merged 1 commit into from
Jul 31, 2024

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport b04f693 from #1627.

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
(cherry picked from commit b04f693)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@sbcd90 sbcd90 merged commit 6028cf7 into 2.15 Jul 31, 2024
29 of 37 checks passed
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

@opensearch-trigger-bot
Copy link
Contributor Author

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

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

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