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

[2.x] Added bwc version 1.3.5 (#3911) #3913

Merged
merged 1 commit into from
Jul 15, 2022

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Jul 14, 2022

Description

Backport PR #3911 / commit e724b2e to 2.x branch

  • Add version 1.3.5 into bwcVersions

Issues Resolved

Due to issue #3218, the PR needs to be created manually.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc 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: GitHub <noreply@github.com>

Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
@tlfeng tlfeng requested review from a team and reta as code owners July 14, 2022 23:16
@tlfeng tlfeng added backport PRs or issues specific to backporting features or enhancments backport 2.0 Backport to 2.0 branch v2.2.0 backport 2.1 labels Jul 14, 2022
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov-commenter
Copy link

Codecov Report

Merging #3913 (115dbd2) into 2.x (ea55054) will decrease coverage by 0.06%.
The diff coverage is 7.69%.

@@             Coverage Diff              @@
##                2.x    #3913      +/-   ##
============================================
- Coverage     70.64%   70.58%   -0.07%     
+ Complexity    56398    56391       -7     
============================================
  Files          4520     4520              
  Lines        271675   271687      +12     
  Branches      39974    39974              
============================================
- Hits         191932   191763     -169     
- Misses        63605    63812     +207     
+ Partials      16138    16112      -26     
Impacted Files Coverage Δ
...adle/testclusters/StandaloneRestIntegTestTask.java 0.00% <0.00%> (ø)
server/src/main/java/org/opensearch/Version.java 81.51% <100.00%> (+0.08%) ⬆️
...g/opensearch/index/analysis/CharFilterFactory.java 0.00% <0.00%> (-100.00%) ⬇️
...adonly/AddIndexBlockClusterStateUpdateRequest.java 0.00% <0.00%> (-75.00%) ⬇️
...readonly/TransportVerifyShardIndexBlockAction.java 9.75% <0.00%> (-58.54%) ⬇️
...n/admin/indices/readonly/AddIndexBlockRequest.java 17.85% <0.00%> (-53.58%) ⬇️
...adcast/BroadcastShardOperationFailedException.java 55.55% <0.00%> (-44.45%) ⬇️
...indices/readonly/TransportAddIndexBlockAction.java 20.68% <0.00%> (-41.38%) ⬇️
...h/action/ingest/SimulateDocumentVerboseResult.java 60.71% <0.00%> (-39.29%) ⬇️
...pensearch/action/ingest/DeletePipelineRequest.java 31.25% <0.00%> (-37.50%) ⬇️
... and 472 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d3c821e...115dbd2. Read the comment docs.

@tlfeng tlfeng merged commit 21c45a5 into opensearch-project:2.x Jul 15, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 15, 2022
Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
(cherry picked from commit 21c45a5)
@tlfeng tlfeng deleted the 2.x-1.3.5 branch July 15, 2022 04:24
tlfeng pushed a commit to tlfeng/OpenSearch that referenced this pull request Jul 15, 2022
…#3913)

Signed-off-by: GitHub <noreply@github.com>

Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
tlfeng pushed a commit that referenced this pull request Jul 15, 2022
Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
(cherry picked from commit 21c45a5)

Co-authored-by: Tianli Feng <ftianli@amazon.com>
tlfeng pushed a commit that referenced this pull request Jul 15, 2022
Co-authored-by: opensearch-ci-bot <opensearch-ci-bot@users.noreply.github.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments backport 2.0 Backport to 2.0 branch backport 2.1 v2.2.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants