Skip to content

[Backport 2.x] Bump netty from 4.1.100.Final to 4.1.104.Final#11777

Merged
reta merged 1 commit into
2.xfrom
backport/backport-11775-to-2.x
Jan 5, 2024
Merged

[Backport 2.x] Bump netty from 4.1.100.Final to 4.1.104.Final#11777
reta merged 1 commit into
2.xfrom
backport/backport-11775-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

@opensearch-trigger-bot opensearch-trigger-bot Bot commented Jan 5, 2024

Backport cbfe160 from #11775.

@github-actions @reta
Bump netty from 4.1.100.Final to 4.1.104.Final (#11775)
e72acb0 
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
(cherry picked from commit cbfe160)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
@reta reta force-pushed the backport/backport-11775-to-2.x branch from e885f06 to e72acb0 Compare January 5, 2024 20:29
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 5, 2024

❌ Gradle check result for e885f06: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 5, 2024 •
edited
Loading

Compatibility status:

Checks if related components are compatible with change e72acb0

Incompatible components

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/reporting.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/performance-analyzer.git]

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Jan 5, 2024

✅ Gradle check result for e72acb0: SUCCESS

@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (6126212) 71.04% compared to head (e72acb0) 71.04%.

Additional details and impacted files 
@@             Coverage Diff              @@
##                2.x   #11777      +/-   ##
============================================
- Coverage     71.04%   71.04%   -0.01%     
- Complexity    59306    59327      +21     
============================================
  Files          4887     4887              
  Lines        279737   279737              
  Branches      41032    41032              
============================================
- Hits         198744   198728      -16     
- Misses        64114    64162      +48     
+ Partials      16879    16847      -32

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@reta reta merged commit 106bda4 into 2.x Jan 5, 2024
@github-actions github-actions Bot deleted the backport/backport-11775-to-2.x branch January 5, 2024 21:29
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor Author

opensearch-trigger-bot Bot commented Jan 5, 2024

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 128

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

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

reta pushed a commit to reta/OpenSearch that referenced this pull request Jan 5, 2024
@opensearch-trigger-bot @github-actions @reta
Bump netty from 4.1.100.Final to 4.1.104.Final (opensearch-project#11775
01abd31 
) (opensearch-project#11777)

(cherry picked from commit cbfe160)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 106bda4)
@reta reta mentioned this pull request Jan 5, 2024
Merged
reta pushed a commit to reta/OpenSearch that referenced this pull request Jan 5, 2024
@opensearch-trigger-bot @github-actions @reta
Bump netty from 4.1.100.Final to 4.1.104.Final (opensearch-project#11775
d637e98 
) (opensearch-project#11777)

(cherry picked from commit cbfe160)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 106bda4)
@reta reta mentioned this pull request Jan 5, 2024
Merged
reta added a commit that referenced this pull request Jan 5, 2024
@reta @opensearch-trigger-bot
Bump netty from 4.1.100.Final to 4.1.104.Final (#11775) (#11777) (#11780
73c29b7 
)

(cherry picked from commit cbfe160)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 106bda4)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
kotwanikunal pushed a commit that referenced this pull request Jan 5, 2024
@reta @opensearch-trigger-bot
Bump netty from 4.1.100.Final to 4.1.104.Final (#11775) (#11777) (#11779
47ab2c4 
)

(cherry picked from commit cbfe160)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(cherry picked from commit 106bda4)

Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@reta reta reta approved these changes

@peternied peternied Awaiting requested review from peternied peternied is a code owner

@abbashus abbashus Awaiting requested review from abbashus

@adnapibar adnapibar Awaiting requested review from adnapibar

@anasalkouz anasalkouz Awaiting requested review from anasalkouz

@andrross andrross Awaiting requested review from andrross andrross is a code owner

@Bukhtawar Bukhtawar Awaiting requested review from Bukhtawar Bukhtawar is a code owner

@CEHENKLE CEHENKLE Awaiting requested review from CEHENKLE

@dblock dblock Awaiting requested review from dblock

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@dreamer-89 dreamer-89 Awaiting requested review from dreamer-89

@gbbafna gbbafna Awaiting requested review from gbbafna gbbafna is a code owner

@kartg kartg Awaiting requested review from kartg

@kotwanikunal kotwanikunal Awaiting requested review from kotwanikunal kotwanikunal is a code owner

@mch2 mch2 Awaiting requested review from mch2 mch2 is a code owner

@msfroh msfroh Awaiting requested review from msfroh msfroh is a code owner

@nknize nknize Awaiting requested review from nknize

@owaiskazi19 owaiskazi19 Awaiting requested review from owaiskazi19 owaiskazi19 is a code owner

@Rishikesh1159 Rishikesh1159 Awaiting requested review from Rishikesh1159

@ryanbogan ryanbogan Awaiting requested review from ryanbogan

@sachinpkale sachinpkale Awaiting requested review from sachinpkale sachinpkale is a code owner

@saratvemulapalli saratvemulapalli Awaiting requested review from saratvemulapalli saratvemulapalli is a code owner

@setiah setiah Awaiting requested review from setiah

@shwetathareja shwetathareja Awaiting requested review from shwetathareja shwetathareja is a code owner

@sohami sohami Awaiting requested review from sohami sohami is a code owner

@tlfeng tlfeng Awaiting requested review from tlfeng

@VachaShah VachaShah Awaiting requested review from VachaShah

Assignees

No one assigned

Labels

backport 1.x

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@reta