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 changelog divergence with 2.x #8152

Merged
merged 1 commit into from
Jun 19, 2023

Conversation

andrross
Copy link
Member

Multiple changes were incorrectly placed in the "Unreleased 3.0" section on main and then backported. This brings the changelog on main in line with 2.x for changes that have been backported.

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

Multiple changes were incorrectly placed in the "Unreleased 3.0" section
on main and then backported. This brings the changelog on main in line
with 2.x for changes that have been backported.

Signed-off-by: Andrew Ross <andrross@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.backpressure.SearchBackpressureIT.testSearchShardTaskCancellationWithHighCpu
      1 org.opensearch.remotestore.RemoteStoreRefreshListenerIT.testRemoteRefreshRetryOnFailure

@codecov
Copy link

codecov bot commented Jun 19, 2023

Codecov Report

Merging #8152 (8626967) into main (1d2c57d) will increase coverage by 0.07%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #8152      +/-   ##
============================================
+ Coverage     70.82%   70.89%   +0.07%     
- Complexity    56596    56642      +46     
============================================
  Files          4722     4722              
  Lines        267608   267608              
  Branches      39216    39216              
============================================
+ Hits         189522   189713     +191     
+ Misses        62114    61900     -214     
- Partials      15972    15995      +23     

see 451 files with indirect coverage changes

@kotwanikunal kotwanikunal merged commit a72edf8 into opensearch-project:main Jun 19, 2023
31 checks passed
@andrross andrross deleted the fix-changelog-2.x branch June 19, 2023 22:04
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
Multiple changes were incorrectly placed in the "Unreleased 3.0" section
on main and then backported. This brings the changelog on main in line
with 2.x for changes that have been backported.

Signed-off-by: Andrew Ross <andrross@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
Multiple changes were incorrectly placed in the "Unreleased 3.0" section
on main and then backported. This brings the changelog on main in line
with 2.x for changes that have been backported.

Signed-off-by: Andrew Ross <andrross@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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.

2 participants