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

Adds release notes for 2.1.0 and revert #1890 #1901

Merged

Conversation

DarshitChanpura
Copy link
Member

Description

  • Category - Maintenance

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

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.

@DarshitChanpura DarshitChanpura force-pushed the release-notes-2.1.0 branch 2 times, most recently from 99f8130 to 98e5cf1 Compare June 24, 2022 00:37
@codecov-commenter
Copy link

codecov-commenter commented Jun 24, 2022

Codecov Report

Merging #1901 (f171d63) into main (d507ebb) will decrease coverage by 0.05%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main    #1901      +/-   ##
============================================
- Coverage     61.00%   60.95%   -0.06%     
+ Complexity     3234     3232       -2     
============================================
  Files           256      256              
  Lines         18088    18087       -1     
  Branches       3224     3224              
============================================
- Hits          11035    11025      -10     
- Misses         5470     5478       +8     
- Partials       1583     1584       +1     
Impacted Files Coverage Δ
...org/opensearch/security/rest/TenantInfoAction.java 77.94% <0.00%> (-10.30%) ⬇️
...ecurity/ssl/rest/SecuritySSLReloadCertsAction.java 84.78% <0.00%> (-0.33%) ⬇️
...a/org/opensearch/security/tools/SecurityAdmin.java 37.31% <0.00%> (-0.25%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d507ebb...f171d63. Read the comment docs.

@DarshitChanpura DarshitChanpura force-pushed the release-notes-2.1.0 branch 3 times, most recently from b662041 to f3af6bb Compare June 24, 2022 22:06
peternied
peternied previously approved these changes Jun 24, 2022
@cliu123
Copy link
Member

cliu123 commented Jun 24, 2022

Converting the draft to an open PR for review.

@cliu123 cliu123 marked this pull request as ready for review June 24, 2022 22:12
@cliu123 cliu123 requested a review from a team June 24, 2022 22:12
cliu123
cliu123 previously approved these changes Jun 24, 2022
@peternied
Copy link
Member

@DarshitChanpura Could you rebase with main, it will use the latest version of the tests that should clear up the intermittent failures

@DarshitChanpura
Copy link
Member Author

@DarshitChanpura Could you rebase with main, it will use the latest version of the tests that should clear up the intermittent failures

Done.. @cliu123 can you please re-review this PR

@DarshitChanpura DarshitChanpura added the backport 2.x backport to 2.x branch label Jun 27, 2022
@DarshitChanpura DarshitChanpura force-pushed the release-notes-2.1.0 branch 2 times, most recently from a247af5 to ac176db Compare June 27, 2022 18:24
peternied
peternied previously approved these changes Jun 27, 2022
@cliu123
Copy link
Member

cliu123 commented Jun 27, 2022

@DarshitChanpura Why this release notes PR includes other changes? If those changes have been merged, please rebase this branch. The PR has been merged, so the changes are not supposed to show as diff in this branch if this branch gets updated changes in main branch.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura
Copy link
Member Author

I have reverted the version bump PR: #1890 commit due to issue #1918

@DarshitChanpura
Copy link
Member Author

@opensearch-project/security Can I get reviews for this?

@DarshitChanpura DarshitChanpura changed the title Adds release notes for 2.1.0 Adds release notes for 2.1.0 and revert #1890 Jun 27, 2022
@peternied peternied merged commit 15f1fbd into opensearch-project:main Jun 27, 2022
@DarshitChanpura DarshitChanpura added backport 2.x backport to 2.x branch and removed backport 2.x backport to 2.x branch labels Jun 27, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 27, 2022
* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

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
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1901-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 15f1fbd6191dc3a80eda02ba2e2a1b835f57db88
# Push it to GitHub
git push --set-upstream origin backport/backport-1901-to-2.x
# Go back to the original working tree
cd ../..
# 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-1901-to-2.x.

peternied pushed a commit that referenced this pull request Jun 27, 2022
* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.com>
stephen-crawford pushed a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
…search-project#1901)

* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (opensearch-project#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
wuychn pushed a commit to ochprince/security that referenced this pull request Mar 16, 2023
…search-project#1901) (opensearch-project#1919)

* Adds release notes for 2.1.0

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>

* Revert "Bump version to 3.0.0.0 (opensearch-project#1890)"

This reverts commit 00e2a5d.

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
(cherry picked from commit 15f1fbd)

Co-authored-by: Darshit Chanpura <35282393+DarshitChanpura@users.noreply.github.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.

4 participants