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 table - merge conflict (#5399) #5405

Merged
merged 1 commit into from
Oct 26, 2023
Merged

Conversation

hdhalter
Copy link
Contributor

Signed-off-by: Heather Halter [email protected]
(cherry picked from commit 3098c99)

Description

Describe what this change achieves.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

Checklist

  • By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
    For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
@hdhalter hdhalter merged commit d60ef58 into 2.11 Oct 26, 2023
4 checks passed
@github-actions github-actions bot deleted the backport/backport-5399-to-2.11 branch October 26, 2023 22:00
@hdhalter hdhalter added the backport 2.10 PR: Backport label for 2.10 label Oct 26, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 26, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
hdhalter pushed a commit that referenced this pull request Oct 26, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
@hdhalter hdhalter added backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5 backport 2.6 PR: Backport label for 2.6 backport 2.7 PR: Backport label for 2.7 backport 2.8 PR: Backport label for 2.8 backport 2.9 PR: Backport label for 2.9 labels Oct 27, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
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 Oct 27, 2023
Signed-off-by: Heather Halter <[email protected]>
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 27, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 31, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 31, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 31, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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>
hdhalter pushed a commit that referenced this pull request Oct 31, 2023
(cherry picked from commit 3098c99)
(cherry picked from commit d60ef58)

Signed-off-by: Heather Halter <[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
Labels
backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5 backport 2.6 PR: Backport label for 2.6 backport 2.7 PR: Backport label for 2.7 backport 2.8 PR: Backport label for 2.8 backport 2.9 PR: Backport label for 2.9 backport 2.10 PR: Backport label for 2.10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant