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

[Version] Increment to 2.2 #1860

Merged
merged 1 commit into from
Jul 25, 2022

Conversation

kavilla
Copy link
Member

@kavilla kavilla commented Jul 7, 2022

Description

Increment from 2.1 to 2.2.

Signed-off-by: Kawika Avilla [email protected]

Issues Related

#1771

Check List

  • New functionality includes testing.
    • All tests pass
      • yarn test:jest
      • yarn test:jest_integration
      • yarn test:ftr
  • New functionality has been documented.
  • Commits are signed per the DCO using --signoff

@kavilla kavilla requested a review from a team as a code owner July 7, 2022 21:44
Increment from 2.1 to 2.2.

Signed-off-by: Kawika Avilla <[email protected]>
@kavilla kavilla force-pushed the avillk/2.x/bump_version branch from 07a71c5 to ca51c2b Compare July 7, 2022 21:46
@kavilla kavilla changed the title [Version] Increment to 2.1 [Version] Increment to 2.2 Jul 7, 2022
@kavilla kavilla merged commit 1dc7b93 into opensearch-project:2.x Jul 25, 2022
@kavilla kavilla deleted the avillk/2.x/bump_version branch July 25, 2022 19:32
@opensearch-trigger-bot
Copy link
Contributor

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

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