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 core XcontentFactory refactor #732

Merged

Conversation

Hailong-am
Copy link
Collaborator

Description

Downstream changes for XContentFactory refactor in core

Issues Resolved

opensearch-project/OpenSearch#8826

Check List

  • 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 Jul 31, 2023

Codecov Report

Merging #732 (20ff68d) into main (58a7578) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main     #732   +/-   ##
=========================================
  Coverage     66.19%   66.19%           
  Complexity      253      253           
=========================================
  Files            39       39           
  Lines          1698     1698           
  Branches        158      158           
=========================================
  Hits           1124     1124           
  Misses          456      456           
  Partials        118      118           
Flag Coverage Δ
opensearch-notifications 66.19% <ø> (ø)

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

@Hailong-am Hailong-am merged commit 216dfcb into opensearch-project:main Jul 31, 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/notifications/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/notifications/backport-2.x
# Create a new branch
git switch --create backport/backport-732-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 216dfcb95eff41ab04785980e89c0bd260b34042
# Push it to GitHub
git push --set-upstream origin backport/backport-732-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/notifications/backport-2.x

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

Hailong-am added a commit to Hailong-am/notifications that referenced this pull request Aug 7, 2023
Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 216dfcb)
Hailong-am added a commit that referenced this pull request Aug 7, 2023
* Fix core XcontentFactory refactor (#732)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit 216dfcb)

* Refactor XContentType to mediaType (#721)

Signed-off-by: Hailong Cui <[email protected]>
(cherry picked from commit d0a322c)
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