diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-10-24 02:37:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 02:37:48 -0700 |
| commit | 0671ce70d93c3dac87dfd851bf62a2746bd34bcf (patch) | |
| tree | 5266379bb9f93c19cfb80d6c37119ff644749558 | |
| parent | 6dd7c5e032a7335231c2800b7a109167a16ac28a (diff) | |
| parent | 6b5ed4cd953aeb0eecd8f30dfe9119c79e6886ec (diff) | |
Merge pull request #1170 from kubernetes/jpbetz-patch-1
Automatic merge from submit-queue.
Clarify how milestone should be set for cherrypicks
| -rw-r--r-- | contributors/devel/cherry-picks.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/devel/cherry-picks.md b/contributors/devel/cherry-picks.md index 43b32bdb..c503476e 100644 --- a/contributors/devel/cherry-picks.md +++ b/contributors/devel/cherry-picks.md @@ -9,7 +9,7 @@ depending on the point in the release cycle. 1. Cherrypicks are [managed with labels and milestones](pull-requests.md#write-release-notes-if-needed) 1. To get a PR merged to the release branch, first ensure the following labels are on the original **master** branch PR: - * An appropriate milestone (e.g. v1.3) + * The milestone for the branch that you want to cherry-pick to (e.g. v1.7 if you want to backport your change in 1.7 branch) * The `cherrypick-candidate` label 1. If `release-note-none` is set on the master PR, the cherrypick PR will need to set the same label to confirm that no release note is needed. |