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

Minor fixes to CHANGELOG #8179

Merged
merged 1 commit into from
Jun 20, 2023
Merged

Conversation

kartg
Copy link
Member

@kartg kartg commented Jun 20, 2023

Description

As a followup to #8152, this fixes some minor differences with the 2.x changelog

Related Issues

N/A

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.

This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@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.indices.replication.SegmentReplicationIT.testScrollCreatedOnReplica

@kartg kartg merged commit e6fd76c into opensearch-project:main Jun 20, 2023
@kartg kartg deleted the fix-changelog branch June 20, 2023 19:57
@kartg kartg added the backport 2.x Backport to 2.x branch label Jun 20, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

kartg added a commit to kartg/OpenSearch that referenced this pull request Jun 20, 2023
This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit e6fd76c)
kartg added a commit that referenced this pull request Jun 20, 2023
This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit e6fd76c)
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 21, 2023
This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…t#8180)

This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
(cherry picked from commit e6fd76c)
imRishN pushed a commit to imRishN/OpenSearch that referenced this pull request Jun 27, 2023
This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@amazon.com>
Signed-off-by: Rishab Nahata <rnnahata@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
This fixes some minor differences with the 2.x changelog

Signed-off-by: Kartik Ganesh <gkart@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
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants