Skip to content

[Backport 2.x] adding Mingshi Liu as a maintainer to the repo - #88

Merged
msfroh merged 1 commit into
opensearch-project:2.xfrom
mingshl:backport-86-to-2.x
Jan 24, 2023
Merged

[Backport 2.x] adding Mingshi Liu as a maintainer to the repo#88
msfroh merged 1 commit into
opensearch-project:2.xfrom
mingshl:backport-86-to-2.x

Conversation

@mingshl

@mingshl mingshl commented Jan 23, 2023

Copy link
Copy Markdown
Collaborator

Addressing #87 to manually redo the back-porting failed PRs on bot #86

adding Mingshi Liu as a maintainer to the repo

(cherry picked from commit 60f6cbb)

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

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.

@mingshl mingshl added the maintenance A change to add support for new versions of OpenSearch or OpenSearch Dashboards from upstream. label Jan 23, 2023
@mingshl
mingshl requested a review from a team January 23, 2023 23:40
@mingshl mingshl self-assigned this Jan 23, 2023
adding Mingshi Liu as a maintainer to the repo

(cherry picked from commit 60f6cbb)
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
@mingshl
mingshl force-pushed the backport-86-to-2.x branch from 7cc0227 to 9cbd326 Compare January 23, 2023 23:42
@msfroh
msfroh merged commit 1142371 into opensearch-project:2.x Jan 24, 2023
@mingshl mingshl added backport 2.x Backport to 2.x branch backport 2.4 Backport to 2.4 branch labels Jan 24, 2023
@opensearch-trigger-bot

Copy link
Copy Markdown

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-88-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1142371f54b923a0f7610c3afaeef9992b7da78a
# Push it to GitHub
git push --set-upstream origin backport/backport-88-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-88-to-2.x.

@opensearch-trigger-bot

Copy link
Copy Markdown

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

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

@mingshl mingshl removed the backport 2.x Backport to 2.x branch label Jan 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.4 Backport to 2.4 branch maintenance A change to add support for new versions of OpenSearch or OpenSearch Dashboards from upstream.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants