-
Notifications
You must be signed in to change notification settings - Fork 104
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] fix monitor renew lock issue #1627
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Subhobrata Dey <[email protected]>
AWSHurneyt
changed the title
fix monitor renew lock issue
[Backport 2.x] fix monitor renew lock issue
Jul 31, 2024
AWSHurneyt
approved these changes
Jul 31, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approved assuming CI passes
riysaxen-amzn
approved these changes
Jul 31, 2024
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]> (cherry picked from commit b04f693) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]> (cherry picked from commit b04f693) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
sbcd90
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
sbcd90
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]> (cherry picked from commit b04f693) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
The backport to
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-1627-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b04f693986b265c27a25fcd4d42f71e0a981d40f
# Push it to GitHub
git push --set-upstream origin backport-1627-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 |
sbcd90
added a commit
to sbcd90/alerting
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
1 task
sbcd90
pushed a commit
that referenced
this pull request
Jul 31, 2024
Signed-off-by: Subhobrata Dey <[email protected]>
AWSHurneyt
pushed a commit
that referenced
this pull request
Jul 31, 2024
* fix monitor renew lock issue (#1627) Signed-off-by: Subhobrata Dey <[email protected]> * fix ktlint Signed-off-by: Subhobrata Dey <[email protected]> * fix compilation issues Signed-off-by: Subhobrata Dey <[email protected]> --------- Signed-off-by: Subhobrata Dey <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
backport of #1623
CheckList:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.