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.14.2] Release Branch #3822

Merged
merged 6 commits into from
Sep 29, 2021
Merged

[v1.14.2] Release Branch #3822

merged 6 commits into from
Sep 29, 2021

Conversation

w-h37
Copy link
Contributor

@w-h37 w-h37 commented Sep 22, 2021

All commits that are going out in 1.14.2 release must be on rel/v1.14.2.
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.14.2 as the development branch for the fix
* land (or have already landed) hotfix changes on release/v1.14 branch, and merge release/v1.14 into rel/v1.14.2
* cherry-pick hotfix commits from ambassador.git to rel/v1.14.2

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

REVIEWERS MUST CHECK THAT:

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

@w-h37 w-h37 requested review from kflynn and rhs September 22, 2021 17:16
Signed-off-by: w-h37 <[email protected]>
kflynn
kflynn previously approved these changes Sep 22, 2021
Copy link
Member

@kflynn kflynn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hit it!

Signed-off-by: AliceProxy <[email protected]>
Signed-off-by: AliceProxy <[email protected]>
@aidanhahn aidanhahn self-requested a review September 29, 2021 04:26
aidanhahn
aidanhahn previously approved these changes Sep 29, 2021
Copy link
Contributor

@aidanhahn aidanhahn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Send it!

Signed-off-by: w-h37 <[email protected]>
…ngelog-updates

Willhardin/v1.14.2/changelog updates
Copy link
Member

@kflynn kflynn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hit it!

@kflynn kflynn merged commit 5f6fb2e into release/v1.14 Sep 29, 2021
@kflynn kflynn deleted the rel/v1.14.2 branch September 29, 2021 15:50
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.

4 participants