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.

Sign up for GitHub

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

Jump to bottom

Resolve merge conflicts #5957

Merged

kolchfa-aws merged 2 commits into 2.0 from backport/backport-5702-to-2.0

Dec 21, 2023

Collaborator

kolchfa-aws commented Dec 21, 2023

Resolve merge conflicts

Checklist

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and subject to the Developers Certificate of Origin.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.


          Resolve merge conflicts

01a73b8

Signed-off-by: Fanit Kolchina <[email protected]>

hdhalter approved these changes

View reviewed changes


          Merge branch '2.0' into backport/backport-5702-to-2.0

019c803

kolchfa-aws merged commit 8c456d3 into 2.0

2 of 3 checks passed

github-actions bot deleted the backport/backport-5702-to-2.0 branch

December 21, 2023 22:48

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet