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

Changelog 2.10.1 #5090

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Changelog 2.10.1 #5090

merged 2 commits into from
Oct 21, 2024

Conversation

sb2k16
Copy link
Member

@sb2k16 sb2k16 commented Oct 21, 2024

Description

This PR Is to add change log for 2.10.1 patch release.

git fetch upstream
git switch 2.10
git fetch upstream --tags
git pull
git-release-notes 2.10.0..HEAD markdown > release/release-notes/data-prepper.change-log-2.10.1.md
git switch main

Check List

  • Commits are signed with a real name per the DCO

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.

Copy link
Member

@dlvenable dlvenable left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sb2k16 , Can you re-run this with the latest changes from the 2.10 branch?

Signed-off-by: Souvik Bose <[email protected]>
@dlvenable dlvenable merged commit c7877c5 into opensearch-project:2.10 Oct 21, 2024
45 of 47 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

sb2k16 added a commit to sb2k16/data-prepper that referenced this pull request Oct 23, 2024
Add change log for 2.10 patch release

Signed-off-by: Souvik Bose <[email protected]>
(cherry picked from commit c7877c5)
@sb2k16 sb2k16 mentioned this pull request Oct 23, 2024
1 task
oeyh pushed a commit that referenced this pull request Oct 23, 2024
Add change log for 2.10 patch release

Signed-off-by: Souvik Bose <[email protected]>
(cherry picked from commit c7877c5)
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