Merge pull request #24894 from david-mcmahon/cp2

Automatic merge from submit-queue Update cherrypick doc for release notes to more accurately reflect current process. ## Contributor guidelines 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 1. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 1. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below.

Merge pull request #24894 from david-mcmahon/cp2
833cfc08 · k8s-merge-robot · e973b5d2 · 8c15651f · 833cfc08
Commit 833cfc08 authored May 09, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 8 deletions

cherry-picks.md docs/devel/cherry-picks.md +6 -8

No files found.
--- a/docs/devel/cherry-picks.md
+++ b/docs/devel/cherry-picks.md
@@ -42,14 +42,12 @@ depending on the point in the release cycle.

 1. Cherrypicks are [managed with labels and milestones]
 (pull-requests.md#release-notes)
-1. All label/milestone accounting happens on PRs on master. There's nothing to
-do on PRs targeted to the release branches.
-1. When you want a PR to be merged to the release branch, make the following
-label changes to the **master** branch PR:
-  * Remove release-note-label-needed
-  * Add an appropriate release-note-(!label-needed) label
-  * Add an appropriate milestone
-  * Add the `cherrypick-candidate` label
+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 `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.
 1. `release-note` labeled PRs generate a release note using the PR title by
   default OR the release-note block in the PR template if filled in.
  * See the [PR template](../../.github/PULL_REQUEST_TEMPLATE.md) for more