📖 Relax our backporting guidelines and policies#3960
Merged
k8s-ci-robot merged 1 commit intoDec 2, 2020
Conversation
k8s-ci-robot
added
the
cncf-cla: yes
Member
Author
|
/milestone v0.4.0 |
k8s-ci-robot
added
the
size/S
Contributor
|
+1 from me /hold to discuss at office hours |
k8s-ci-robot
added
the
do-not-merge/hold
detiber
reviewed
Nov 30, 2020
Contributor
detiber
left a comment
detiber
left a comment
There was a problem hiding this comment.
minor nit, otherwise lgtm
Contributor
|
LGTM pending Jason's suggestion |
Member
|
lgtm for me |
This change relaxes and defines a bit more what can be backported and how. After this change is merged, we'll allow both bug fixes and minor (non-breaking) features to be backported if at least one or more maintainers approves the cherry pick. With these changes we aim to be more welcoming of changes to the current stable branch instead of stopping the world until the next releases. The only caveat is that backports that I'd like to highlight is that backporting is an expensive operation. More often that not, a cherry-picked commit requires another full review because changes are usually not compatible. Going forward, we won't allow PRs to target a release branch directly, we'll always require changes to go in the main branch first, and only after they've been merged, to backport them. Signed-off-by: Vince Prignano <vincepri@vmware.com>
vincepri
force-pushed
the
contributing-guide-backports
branch
from
e9c647b to
45aaa16
Compare
Member
Author
|
This should be good to go, we discussed it at the community meeting as well /hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
k8s-ci-robot
added
the
lgtm
Contributor
|
/lgtm |
Member
Author
|
/test pull-cluster-api-test-main |
CecileRobertMichon
approved these changes
Dec 2, 2020
Contributor
CecileRobertMichon
left a comment
CecileRobertMichon
left a comment
There was a problem hiding this comment.
/lgtm
/approve
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Member
Author
|
/test pull-cluster-api-test-main |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This change relaxes and defines a bit more what can be backported and
how. After this change is merged, we'll allow both bug fixes and minor
(non-breaking) features to be backported if at least one or more
maintainers approves the cherry pick.
With these changes we aim to be more welcoming of changes to the current
stable branch instead of stopping the world until the next releases.
The only caveat is that backports that I'd like to highlight is that
backporting is an expensive operation. More often that not,
a cherry-picked commit requires another full review because changes are
usually not compatible.
Going forward, we won't allow PRs to target a release branch directly,
we'll always require changes to go in the main branch first, and only
after they've been merged, to backport them.
Signed-off-by: Vince Prignano vincepri@vmware.com
/assign @CecileRobertMichon @ncdc @detiber