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

[Backport 2.x] fix for doc level query constructor change #681

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 58a3a83 from #651

Signed-off-by: Surya Sashank Nistala <[email protected]>
(cherry picked from commit 58a3a83)
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Merging #681 (7c4c60c) into 2.x (6264eb4) will increase coverage by 0.00%.
The diff coverage is 0.00%.

@@            Coverage Diff            @@
##                2.x     #681   +/-   ##
=========================================
  Coverage     25.06%   25.07%           
- Complexity      944      945    +1     
=========================================
  Files           255      255           
  Lines         11157    11160    +3     
  Branches       1250     1250           
=========================================
+ Hits           2797     2798    +1     
- Misses         8107     8110    +3     
+ Partials        253      252    -1     
Files Coverage Δ
...ch/securityanalytics/findings/FindingsService.java 35.89% <0.00%> (ø)
...lytics/transport/TransportIndexDetectorAction.java 0.00% <0.00%> (ø)

... and 1 file with indirect coverage changes

@AWSHurneyt AWSHurneyt merged commit abd874e into 2.x Oct 24, 2023
12 of 15 checks passed
@github-actions github-actions bot deleted the backport/backport-651-to-2.x branch October 24, 2023 22:45
@AWSHurneyt AWSHurneyt added the backport 2.9 backports to 2.9 label Aug 7, 2024
@opensearch-trigger-bot
Copy link
Contributor Author

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.9 backports to 2.9
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants