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

remove integration content #1738

Merged

Conversation

YANG-DB
Copy link
Member

@YANG-DB YANG-DB commented Oct 12, 2023

Description

remove integration content in favour of the same content residing in the catalog repo

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc 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.

@derek-ho derek-ho merged commit c2deff1 into opensearch-project:main Feb 7, 2024
14 of 15 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/observability/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/observability/backport-2.x
# Create a new branch
git switch --create backport/backport-1738-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c2deff1c41a0fbd533f02af6497890b406c5e15d
# Push it to GitHub
git push --set-upstream origin backport/backport-1738-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/observability/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1738-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.

3 participants