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 upstream refactor changes #226

Merged
merged 1 commit into from
Feb 22, 2023

Conversation

VijayanB
Copy link
Member

@VijayanB VijayanB commented Feb 22, 2023

Description

XContent is moved from common to core .
Upstream change: opensearch-project/OpenSearch#5902.

Issues Resolved

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.

XContent is moved from common to core

Signed-off-by: Vijayan Balasubramanian <[email protected]>
@VijayanB VijayanB requested a review from a team February 22, 2023 01:42
@VijayanB VijayanB self-assigned this Feb 22, 2023
@codecov-commenter
Copy link

codecov-commenter commented Feb 22, 2023

Codecov Report

Merging #226 (80ba3e5) into main (0d5763f) will decrease coverage by 0.17%.
The diff coverage is n/a.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main     #226      +/-   ##
============================================
- Coverage     85.06%   84.89%   -0.17%     
  Complexity      378      378              
============================================
  Files            52       52              
  Lines          1185     1185              
  Branches         98       98              
============================================
- Hits           1008     1006       -2     
- Misses          135      137       +2     
  Partials         42       42              
Impacted Files Coverage Δ
...geospatial/action/upload/geojson/IndexManager.java 85.71% <ø> (ø)
...spatial/action/upload/geojson/PipelineManager.java 91.66% <ø> (ø)
...on/upload/geojson/UploadGeoJSONRequestContent.java 92.85% <ø> (ø)
...l/action/upload/geojson/UploadGeoJSONResponse.java 86.48% <ø> (ø)
...earch/geospatial/index/mapper/xypoint/XYPoint.java 74.13% <ø> (ø)
...geospatial/index/mapper/xypoint/XYPointParser.java 73.46% <ø> (ø)
...atial/index/query/xyshape/XYShapeQueryBuilder.java 78.04% <ø> (ø)
...opensearch/geospatial/plugin/GeospatialPlugin.java 92.85% <ø> (ø)
...s/bucket/geogrid/GeoHexGridAggregationBuilder.java 76.00% <ø> (ø)
.../aggregations/bucket/geogrid/ParsedGeoHexGrid.java 100.00% <ø> (ø)
... and 8 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@VijayanB VijayanB added the backport 2.x Backport PR to 2.x branch label Feb 22, 2023
@VijayanB VijayanB merged commit 8eb3571 into opensearch-project:main Feb 22, 2023
@opensearch-trigger-bot
Copy link

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

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport PR to 2.x branch Refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants