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

Backport 2.x to 2.3 with conflict resolving changes #997

Merged
merged 5 commits into from
Sep 7, 2022

Conversation

mengweieric
Copy link
Collaborator

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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.

vamsi-amazon and others added 5 commits August 5, 2022 17:43
* Bump to 2.2.0

Signed-off-by: vamsi-amazon <reddyvam@amazon.com>

* Update snapshots

Signed-off-by: Joshua Li <joshuali925@gmail.com>

Co-authored-by: Joshua Li <joshuali925@gmail.com>
)

Signed-off-by: vamsi-amazon <reddyvam@amazon.com>
(cherry picked from commit 77c460f)

Co-authored-by: vamsi-amazon <reddyvam@amazon.com>
…ensearch-project#939)

* Version increment automation

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Version increment automation

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Version increment automation: task rename updateVersion

Signed-off-by: pgodithi <pgodithi@amazon.com>
(cherry picked from commit b5c6802)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Signed-off-by: pgodithi <pgodithi@amazon.com>
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: Eric Wei <menwe@amazon.com>
@mengweieric mengweieric requested a review from a team as a code owner September 7, 2022 20:37
@codecov-commenter
Copy link

codecov-commenter commented Sep 7, 2022

Codecov Report

Merging #997 (7f12ab3) into 2.3 (0c031d4) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##                2.3     #997   +/-   ##
=========================================
  Coverage     59.15%   59.15%           
  Complexity      283      283           
=========================================
  Files           240      240           
  Lines          7833     7833           
  Branches       1621     1621           
=========================================
  Hits           4634     4634           
  Misses         3025     3025           
  Partials        174      174           
Flag Coverage Δ
dashboards-observability 52.54% <ø> (ø)
opensearch-observability 76.60% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@mengweieric mengweieric merged commit 08e0390 into opensearch-project:2.3 Sep 7, 2022
@mengweieric mengweieric deleted the 2.x branch September 7, 2022 22:06
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.

6 participants