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

fix license problem #1392

Conversation

xinyual
Copy link
Collaborator

@xinyual xinyual commented Sep 27, 2023

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • 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: xinyual <[email protected]>
@xinyual xinyual temporarily deployed to ml-commons-cicd-env September 27, 2023 01:28 — with GitHub Actions Inactive
@xinyual xinyual temporarily deployed to ml-commons-cicd-env September 27, 2023 01:28 — with GitHub Actions Inactive
@xinyual xinyual temporarily deployed to ml-commons-cicd-env September 27, 2023 01:28 — with GitHub Actions Inactive
@zane-neo zane-neo merged commit 5f84da6 into opensearch-project:neural-sparse Sep 27, 2023
5 of 8 checks passed
@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-1392-to-main
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5f84da6641cb2a1c038bb08aef7a56817068d6ad
# Push it to GitHub
git push --set-upstream origin backport/backport-1392-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-1392-to-main.

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