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 from upstream core.action changes #1590

Merged
merged 2 commits into from
Aug 15, 2023

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Aug 14, 2023

Description

Fix from upstream: opensearch-project/OpenSearch#9082

Issues Resolved

[List any issues this PR will resolve]

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.

Signed-off-by: Derek Ho <[email protected]>
YANG-DB
YANG-DB previously approved these changes Aug 14, 2023
vmmusings
vmmusings previously approved these changes Aug 14, 2023
@ps48 ps48 changed the title fix from upstream Fix from upstream core.action changes Aug 15, 2023
Signed-off-by: Derek Ho <[email protected]>
@derek-ho derek-ho dismissed stale reviews from vmmusings and YANG-DB via 02f3a88 August 15, 2023 15:29
@derek-ho derek-ho merged commit 033779c into opensearch-project:main Aug 15, 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:

# 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-1590-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 033779cffb797f2afdeaf38552849571875dcc38
# Push it to GitHub
git push --set-upstream origin backport/backport-1590-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-1590-to-2.x.

derek-ho added a commit to derek-ho/observability that referenced this pull request Aug 15, 2023
* fix from upstream

Signed-off-by: Derek Ho <[email protected]>

* pull latest snaphost

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 033779c)
Signed-off-by: Derek Ho <[email protected]>
derek-ho added a commit that referenced this pull request Aug 15, 2023
* Fix from upstream core.action changes (#1590)

* fix from upstream

Signed-off-by: Derek Ho <[email protected]>

* pull latest snaphost

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
(cherry picked from commit 033779c)
Signed-off-by: Derek Ho <[email protected]>

* Update build.gradle

Revert build.gradle

Signed-off-by: Derek Ho <[email protected]>

---------

Signed-off-by: Derek Ho <[email protected]>
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.

5 participants