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] bumping ktlint and resolving conflicts (#1792) #1793

Merged

Conversation

sejli
Copy link
Contributor

@sejli sejli commented Feb 6, 2024

Signed-off-by: Sean Li lnse@amazon.com
(cherry picked from commit 34f6490)

Description

Manual backport for #1792

Issues Resolved

N/A

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.

Signed-off-by: Sean Li <lnse@amazon.com>
(cherry picked from commit 34f6490)
@sejli sejli changed the title [BACKPORT 2.x] bumping ktlint and resolving conflicts (#1792) [Backport 2.x] bumping ktlint and resolving conflicts (#1792) Feb 6, 2024
@sejli sejli added security fix Security fix generated by WhiteSource failed backport infrastructure and removed failed backport labels Feb 6, 2024
@joshuali925 joshuali925 merged commit bb04134 into opensearch-project:2.x Feb 8, 2024
16 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure security fix Security fix generated by WhiteSource
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants