-
Notifications
You must be signed in to change notification settings - Fork 282
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
Adds opensearch trigger bot to discerning merger list to allow automatic merges #3474
Adds opensearch trigger bot to discerning merger list to allow automatic merges #3474
Conversation
…tic merges Signed-off-by: Darshit Chanpura <[email protected]>
@DarshitChanpura Mind resolving this other [1] at the same time? |
Signed-off-by: Darshit Chanpura <[email protected]>
done. |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-1.x
# Create a new branch
git switch --create backport/backport-3474-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 999339e7ea3043f6be9342685b7e7c70b5dd55ae
# Push it to GitHub
git push --set-upstream origin backport/backport-3474-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-1.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-1.3 1.3
# Navigate to the new working tree
pushd ../.worktrees/security/backport-1.3
# Create a new branch
git switch --create backport/backport-3474-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 999339e7ea3043f6be9342685b7e7c70b5dd55ae
# Push it to GitHub
git push --set-upstream origin backport/backport-3474-to-1.3
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-1.3 Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3474-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 999339e7ea3043f6be9342685b7e7c70b5dd55ae
# Push it to GitHub
git push --set-upstream origin backport/backport-3474-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x Then, create a pull request where the |
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.11 2.11
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.11
# Create a new branch
git switch --create backport/backport-3474-to-2.11
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 999339e7ea3043f6be9342685b7e7c70b5dd55ae
# Push it to GitHub
git push --set-upstream origin backport/backport-3474-to-2.11
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.11 Then, create a pull request where the |
@DarshitChanpura, cold you plz create backports manually? |
…tic merges (opensearch-project#3474) ### Description With this change version increment PRs can be automatically merge by opensearch-trigger-bot. - Resolves: opensearch-project#3408 ### Check List ~- [ ] New functionality includes testing~ ~- [ ] New functionality has been documented~ - [x] Commits are signed 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). --------- Signed-off-by: Darshit Chanpura <[email protected]> (cherry picked from commit 999339e)
…tic merges (opensearch-project#3474) ### Description With this change version increment PRs can be automatically merge by opensearch-trigger-bot. - Resolves: opensearch-project#3408 ### Check List ~- [ ] New functionality includes testing~ ~- [ ] New functionality has been documented~ - [x] Commits are signed 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin). --------- Signed-off-by: Darshit Chanpura <[email protected]> (cherry picked from commit 999339e)
…tic merges (opensearch-project#3474) Signed-off-by: Darshit Chanpura <[email protected]> (cherry picked from commit 999339e)
…tic merges (opensearch-project#3474) Signed-off-by: Darshit Chanpura <[email protected]> (cherry picked from commit 999339e)
… to allow automatic merges (#3474) (#3481) Backports #3474 via commit 999339e) Not sure why manual backport was required as there were no conflicts ### Check List ~- [ ] New functionality includes testing~ ~- [ ] New functionality has been documented~ - [x] Commits are signed 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
… to allow automatic merges (#3474) (#3484) Backports #3474 via commit 999339e Since the original file was not present in 1.3 line, this PR adds the file too. (Essentially backports #3408 as well) ### Check List ~- [ ] New functionality includes testing~ ~- [ ] New functionality has been documented~ - [x] Commits are signed 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](https://github.com/opensearch-project/OpenSearch/blob/main/CONTRIBUTING.md#developer-certificate-of-origin).
Description
With this change version increment PRs can be automatically merge by opensearch-trigger-bot.
Check List
- [ ] New functionality includes testing- [ ] New functionality has been documentedBy 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.