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

Copy latest Apache version to 2.9 #876

Merged
merged 1 commit into from
Aug 9, 2023

Conversation

Swiddis
Copy link
Collaborator

@Swiddis Swiddis commented Aug 8, 2023

Description

Due to mixed revision and backport events, Apache has two broken PRs open and 2.x + 2.9 are both out of date. This is one of two syncing PRs to close #800 and #833.

Issues Resolved

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.

@codecov
Copy link

codecov bot commented Aug 8, 2023

Codecov Report

Merging #876 (e65a325) into 2.9 (7eef82a) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              2.9     #876   +/-   ##
=======================================
  Coverage   43.57%   43.57%           
=======================================
  Files         313      313           
  Lines       18618    18618           
  Branches     4536     4536           
=======================================
  Hits         8113     8113           
  Misses       9952     9952           
  Partials      553      553           
Flag Coverage Δ
dashboards-observability 43.57% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@Swiddis Swiddis requested a review from YANG-DB August 8, 2023 23:55
@Swiddis Swiddis added integrations Used to denote items related to the Integrations project backport 2.9 labels Aug 8, 2023
@Swiddis Swiddis merged commit 52567ac into opensearch-project:2.9 Aug 9, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

@Swiddis Swiddis mentioned this pull request Aug 9, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.9 integrations Used to denote items related to the Integrations project
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants