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

Bump mockito version #701

Merged
merged 1 commit into from
Feb 23, 2023
Merged

Conversation

bowenlan-amzn
Copy link
Member

@bowenlan-amzn bowenlan-amzn commented Feb 23, 2023

Issue #, if available:

Description of changes:

opensearch-project/OpenSearch#6088
https://build.ci.opensearch.org/blue/organizations/jenkins/integ-test/detail/integ-test/3826/pipeline/

CheckList:

  • 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.

Signed-off-by: bowenlan-amzn <[email protected]>
@bowenlan-amzn bowenlan-amzn marked this pull request as ready for review February 23, 2023 18:20
@bowenlan-amzn bowenlan-amzn requested a review from a team February 23, 2023 18:20
@bowenlan-amzn bowenlan-amzn merged commit 9ed4016 into opensearch-project:2.6 Feb 23, 2023
@bowenlan-amzn bowenlan-amzn deleted the 2.6 branch February 23, 2023 18:22
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 24, 2023
Signed-off-by: bowenlan-amzn <[email protected]>
(cherry picked from commit 9ed4016)
@opensearch-trigger-bot
Copy link
Contributor

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

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

bowenlan-amzn added a commit that referenced this pull request Feb 27, 2023
Signed-off-by: bowenlan-amzn <[email protected]>
(cherry picked from commit 9ed4016)

Co-authored-by: bowenlan-amzn <[email protected]>
wuychn pushed a commit to ochprince/index-management that referenced this pull request Mar 16, 2023
ronnaksaxena pushed a commit to ronnaksaxena/index-management that referenced this pull request Jul 19, 2023
Signed-off-by: bowenlan-amzn <[email protected]>
(cherry picked from commit 9ed4016)

Co-authored-by: bowenlan-amzn <[email protected]>
Signed-off-by: Ronnak Saxena <[email protected]>
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.

3 participants