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

Post 2.6.0 release update for changelog and compatibility #564

Merged
merged 2 commits into from
Aug 9, 2023

Conversation

VachaShah
Copy link
Collaborator

Description

Describe what this change achieves.

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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.

dblock
dblock previously approved these changes Jul 6, 2023
@VachaShah
Copy link
Collaborator Author

@dblock @reta Resolved some merge conflicts which reset the approvals. Can I get reviews again? Thank you!

dblock
dblock previously approved these changes Aug 7, 2023
Signed-off-by: Daniel (dB.) Doubrovkine <[email protected]>
@dblock
Copy link
Member

dblock commented Aug 9, 2023

Can we include CHANGELOG changes as a preparation for the release for next time? Maybe somewhere in instructions?

@reta reta merged commit ddff6ce into opensearch-project:main Aug 9, 2023
1 check passed
@reta reta added the backport 2.x Backport to 2.x branch label Aug 9, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-564-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ddff6cec9b475c9130516f83569ddb214d203dbe
# Push it to GitHub
git push --set-upstream origin backport/backport-564-to-2.x
# Go back to the original working tree
popd
# 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-564-to-2.x.

@VachaShah
Copy link
Collaborator Author

Can we include CHANGELOG changes as a preparation for the release for next time? Maybe somewhere in instructions?

Sure! I will add them in the instructions.

@reta
Copy link
Collaborator

reta commented Aug 9, 2023

@VachaShah we need to backport to 2.x manually, sadly

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants