Skip to content

Removing changelog entry for the released fix#13598

Merged
andrross merged 4 commits into
opensearch-project:mainfrom
sgup432:irc_changelog_fix
May 29, 2024
Merged

Removing changelog entry for the released fix#13598
andrross merged 4 commits into
opensearch-project:mainfrom
sgup432:irc_changelog_fix

Conversation

@sgup432
Copy link
Copy Markdown
Contributor

@sgup432 sgup432 commented May 8, 2024

Description

Removing the change log entry as this fix is being released in 2.14.
See #13591

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • [ ] Public documentation issue/PR created

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: Sagar Upadhyaya <upasagar@amazon.com>
@sgup432
Copy link
Copy Markdown
Contributor Author

sgup432 commented May 8, 2024

@andrross Can you check this one?

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 8, 2024

❌ Gradle check result for 6e78cec: 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?

@andrross
Copy link
Copy Markdown
Member

andrross commented May 8, 2024

@sgup432 The release notes file should be the same across branches as well. I think this entry needs to be added there.

@andrross
Copy link
Copy Markdown
Member

@sgup432 Friendly ping :) Let's get this fixed before the next release.

@sgup432
Copy link
Copy Markdown
Contributor Author

sgup432 commented May 23, 2024

@andrross Looking into this. Somehow missed this.

@sgup432
Copy link
Copy Markdown
Contributor Author

sgup432 commented May 23, 2024

Ok I so need to do below:

  1. Need to remove this from 2.x branch CHANGELOG as well.
  2. Update release note for 2.x
  3. Update release note for main branch as well here.

sgup432 added 2 commits May 28, 2024 17:37
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
@sgup432
Copy link
Copy Markdown
Contributor Author

sgup432 commented May 29, 2024

@andrross I have updated main branch changelog and release notes in this PR.
And fixed for 2.x here - #13863

@dblock dblock added the backport 2.x Backport to 2.x branch label May 29, 2024
@dblock
Copy link
Copy Markdown
Member

dblock commented May 29, 2024

And fixed for 2.x here - #13863

We can automatically backport from main, FYI after this is merged.

@andrross andrross merged commit 84ad3a7 into opensearch-project:main May 29, 2024
@opensearch-trigger-bot
Copy link
Copy Markdown
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:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-13598-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 84ad3a7d2dc4410954b30d1c22d908047cfdd73b
# Push it to GitHub
git push --set-upstream origin backport/backport-13598-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

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

parv0201 pushed a commit to parv0201/OpenSearch that referenced this pull request Jun 10, 2024
Signed-off-by: Sagar Upadhyaya <upasagar@amazon.com>
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Co-authored-by: Sagar Upadhyaya <upasagar@amazon.com>
wdongyu pushed a commit to wdongyu/OpenSearch that referenced this pull request Aug 22, 2024
Signed-off-by: Sagar Upadhyaya <upasagar@amazon.com>
Signed-off-by: Sagar Upadhyaya <sagar.upadhyaya.121@gmail.com>
Co-authored-by: Sagar Upadhyaya <upasagar@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants