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

GA updates and minor BWC test cleanups #104

Merged
merged 1 commit into from
Jan 30, 2024

Conversation

reta
Copy link
Collaborator

@reta reta commented Jan 29, 2024

Description

GA updates and minor BWC test cleanups

Issues Resolved

Closes https://github.com/opensearch-project/custom-codecs/security/dependabot/1

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: Andriy Redko <andriy.redko@aiven.io>
@reta
Copy link
Collaborator Author

reta commented Jan 30, 2024

@andrross @sarthakaggarwal97 could you please help me here? thank you

@sarthakaggarwal97
Copy link
Collaborator

thanks @reta, lgtm

@sarthakaggarwal97 sarthakaggarwal97 merged commit c319746 into opensearch-project:main Jan 30, 2024
17 checks passed
@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:

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

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-104-to-2.x.

@sarthakaggarwal97
Copy link
Collaborator

sarthakaggarwal97 commented Jan 30, 2024

@reta this will be backported right?
Please remove the label if it's otherwise, thank you!

@reta
Copy link
Collaborator Author

reta commented Jan 30, 2024

Please remove the label if it's otherwise, thank you!

On it, thanks a lot @sarthakaggarwal97 !

reta added a commit to reta/custom-codecs that referenced this pull request Jan 30, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c319746)
sarthakaggarwal97 pushed a commit that referenced this pull request Jan 30, 2024
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit c319746)
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.

2 participants