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] Update Andriy Redko (https://github.com/reta) affiliation (#17430) #17431

Merged

Conversation

reta
Copy link
Collaborator

@reta reta commented Feb 23, 2025

Backport of #17430 to 2.x

@gaobinlong gaobinlong merged commit 4327cb1 into opensearch-project:2.x Feb 24, 2025
68 of 69 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 24, 2025
…17431)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 4bd1323)
(cherry picked from commit 4327cb1)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot
Copy link
Contributor

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

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

reta added a commit to reta/OpenSearch that referenced this pull request Feb 24, 2025
peternied pushed a commit that referenced this pull request Feb 24, 2025
…17431) (#17435)

Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 4bd1323)
(cherry picked from commit 4327cb1)
peternied pushed a commit that referenced this pull request Feb 24, 2025
…17431) (#17434)

(cherry picked from commit 4bd1323)
(cherry picked from commit 4327cb1)

Signed-off-by: Andriy Redko <[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