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

[FORWARDPORT main] Release notes 2.19 on main #17317

Merged

Conversation

jainankitk
Copy link
Collaborator

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.

@jainankitk
Copy link
Collaborator Author

@andrross / @reta - Continuing the conversation from #17302 (comment), forwardport for main becomes really tricky in that case. For strict correctness, should we manually move entries to 3.0 changelog for PRs that have not been backported?

@jainankitk jainankitk changed the title Release notes 2.19 on main [FORWARDPORT main] Release notes 2.19 on main Feb 11, 2025
@reta
Copy link
Collaborator

reta commented Feb 11, 2025

For strict correctness, should we manually move entries to 3.0 changelog for PRs that have not been backported?

Thanks @jainankitk I think we have to backport all missing entries to 2.x branch

@andrross
Copy link
Member

For strict correctness, should we manually move entries to 3.0 changelog for PRs that have not been backported?

Thanks @jainankitk I think we have to backport all missing entries to 2.x branch

At this point we are not planning another release on the 2.x branch, so I believe @jainankitk is correct that they should go to the 3.0 changelog, as 3.0 will be the first release in which they are included.

@reta
Copy link
Collaborator

reta commented Feb 11, 2025

At this point we are not planning another release on the 2.x branch

Thanks @andrross , but we do plan 2.19.x patch releases, correct? These fixes should be there I think, no?

@andrross
Copy link
Member

At this point we are not planning another release on the 2.x branch

Thanks @andrross , but we do plan 2.19.x patch releases, correct? These fixes should be there I think, no?

Yeah, we will release patches from the 2.19 branch. We generally try to limit those patches to dependency updates and critical bug fixes. I think these changes are not critical given that they have been missed from being backported at all. I think it is fine to punt them to the 3.0 release.

By the way, the simplified branching strategy should help prevent these problems in the future given that we won't need to backport things.

@jainankitk
Copy link
Collaborator Author

@andrross / @reta - Thanks for providing your inputs. I guess we should merge this PR as is for now and punt 2.x entries to 3.0 release notes, when we finalize the 3.0 release? Although unlikely, this keeps us covered in case there is 2.20 for some unforeseen reason?

@andrross andrross merged commit d0a65d3 into opensearch-project:main Feb 11, 2025
54 of 55 checks passed
@jainankitk jainankitk deleted the release-notes-2.19-on-main branch February 12, 2025 21:48
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