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

[v1.13.10] Release Branch #3605

Merged
merged 20 commits into from
Jul 28, 2021
Merged

[v1.13.10] Release Branch #3605

merged 20 commits into from
Jul 28, 2021

Conversation

kflynn
Copy link
Member

@kflynn kflynn commented Jul 14, 2021

All commits that are going out in 1.13.10 release must be on rel/v1.13.10.
This will allow the appropriate CI to run.

To get the hotfix changes onto this branch you can do one of the following:
* use rel/v1.13.10 as the development branch for the fix
* land (or have already landed) hotfix changes on release/v1.13 branch, and merge release/v1.13 into rel/v1.13.10
* cherry-pick hotfix commits from ambassador.git to rel/v1.13.10

It is okay if you've already landed the hotfix changes on release/v1.13 branch,
reviewers just need to validate that the hotfix commits are in the tree for rel/v1.13.10,
and all the appropriate changelog updates exist.

REVIEWERS MUST CHECK THAT:

  • hotfix commits are on rel/v1.13.10
  • CHANGELOG updates are on rel/v1.13.10

@kflynn kflynn requested review from rhs and acookin July 14, 2021 22:03
@kflynn kflynn removed the request for review from rhs July 14, 2021 22:06
@aidanhahn aidanhahn self-requested a review July 27, 2021 03:35
aidanhahn
aidanhahn previously approved these changes Jul 27, 2021
@aidanhahn aidanhahn self-requested a review July 28, 2021 14:28
@aidanhahn aidanhahn merged commit c2dc110 into release/v1.13 Jul 28, 2021
@aidanhahn aidanhahn deleted the rel/v1.13.10 branch July 28, 2021 16:41
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.

3 participants