Skip to content

Conversation

@dbwiddis
Copy link
Member

Backport 0419e5d from #15362

@dbwiddis dbwiddis changed the title [Backport 2.x] Fix typo super->sb in method toString() of RemoteStoreNodeAttribute (… [Backport 2.x] Fix typo super->sb in method toString() of RemoteStoreNodeAttribute(#15362) Oct 21, 2024
…pensearch-project#15362)

* Removed unused StringBuilder

Signed-off-by: Dmitry Kryukov <[email protected]>

* Restored lines, fixed typo super -> sb

Signed-off-by: Dmitry Kryukov <[email protected]>

* Updated CHANGELOG.md

Signed-off-by: Dmitry Kryukov <[email protected]>

---------

Signed-off-by: Dmitry Kryukov <[email protected]>
@dbwiddis dbwiddis force-pushed the backport-15362-to-2.x branch from a82663b to b99a0ac Compare October 21, 2024 02:59
@github-actions
Copy link
Contributor

❌ Gradle check result for b99a0ac: 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
Contributor

✅ Gradle check result for b99a0ac: SUCCESS

@codecov
Copy link

codecov bot commented Oct 21, 2024

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 71.84%. Comparing base (a31e7f2) to head (b202427).
Report is 7 commits behind head on 2.x.

Files with missing lines Patch % Lines
...rch/node/remotestore/RemoteStoreNodeAttribute.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #16395      +/-   ##
============================================
- Coverage     71.91%   71.84%   -0.07%     
- Complexity    65221    65230       +9     
============================================
  Files          5308     5308              
  Lines        304350   304350              
  Branches      44268    44268              
============================================
- Hits         218867   218661     -206     
- Misses        67234    67561     +327     
+ Partials      18249    18128     -121     

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

@dblock
Copy link
Member

dblock commented Oct 21, 2024

Rebase?

@dbwiddis
Copy link
Member Author

Most of my manual backports are adding to thte end of the changelog (that's why the conflicted again) and can be easily resolved by any maintainer clicking "Resolve Conflicts" and editing the changelog appropriately (after CI runs completely again, we shouldn't rerun CI based only on a changelog update!)

@github-actions
Copy link
Contributor

✅ Gradle check result for b202427: SUCCESS

@dbwiddis
Copy link
Member Author

dbwiddis commented Oct 22, 2024

@dblock could I get a re-review? The merge conflict resolution invalidated your previous one. 2.18 code freeze coming up today and I've got a few pending manual backports....

@owaiskazi19 owaiskazi19 merged commit 89ed273 into opensearch-project:2.x Oct 22, 2024
37 of 39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants