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 1.x] Removed Leftover X Pack references #2716

Merged

Conversation

joshuarrrr
Copy link
Member

backport 82f82a1 from #2638

…h-project#2638)

x-pack references in the code are removed as per the given files in opensearch-project#2517

Issue Resolved:
opensearch-project#2517

Signed-off-by: vimal K <[email protected]>
(cherry picked from commit 82f82a1)
@ashwin-pc ashwin-pc merged commit 399b029 into opensearch-project:1.x Nov 4, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 4, 2022
x-pack references in the code are removed as per the given files in #2517

Issue Resolved:
#2517

Signed-off-by: vimal K <[email protected]>
(cherry picked from commit 82f82a1)

Co-authored-by: Vimal K <[email protected]>
(cherry picked from commit 399b029)
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

joshuarrrr added a commit that referenced this pull request Nov 4, 2022
x-pack references in the code are removed as per the given files in #2517

Issue Resolved:
#2517

Signed-off-by: vimal K <[email protected]>
(cherry picked from commit 82f82a1)

Co-authored-by: Vimal K <[email protected]>
(cherry picked from commit 399b029)

Co-authored-by: Josh Romero <[email protected]>
@ananzh ananzh added the v1.3.7 label Jan 26, 2023
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.

5 participants