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

fix alert constructor with noop trigger to use execution id and workflow id #981

Merged
merged 4 commits into from
Jul 8, 2023

Conversation

eirsep
Copy link
Member

@eirsep eirsep commented Jul 7, 2023

fix alert constructor with noop trigger to use execution id and workflow id, syncing with common utils changes

sbcd90 and others added 2 commits July 7, 2023 23:44
remove httpcomponents force version
@sbcd90 sbcd90 merged commit 6da86fe into opensearch-project:main Jul 8, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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

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

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.

3 participants