From a71cb19867cd6bb629ddae3cb4f3915e6c347a02 Mon Sep 17 00:00:00 2001 From: David McMahon Date: Thu, 7 Apr 2016 17:14:13 -0700 Subject: [PATCH] Clarify release-note label requirement for non-master PRs. --- docs/devel/pull-requests.md | 2 +- docs/proposals/release-notes.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/pull-requests.md b/docs/devel/pull-requests.md index 5085651e8f7..a5aeac766da 100644 --- a/docs/devel/pull-requests.md +++ b/docs/devel/pull-requests.md @@ -86,7 +86,7 @@ This section applies only to pull requests on the master branch. The only exception to these rules is when a PR is not a cherry-pick and is targeted directly to the non-master branch. In this case, a `release-note-*` -label is optional (and not enforced). +label is required for that non-master PR. ### Reviewing pre-release notes diff --git a/docs/proposals/release-notes.md b/docs/proposals/release-notes.md index 20c8faa83ba..e77c2769bc7 100644 --- a/docs/proposals/release-notes.md +++ b/docs/proposals/release-notes.md @@ -121,7 +121,7 @@ will be collected from that cherry-pick PR. The only exception to this rule is when a PR is not a cherry-pick and is targeted directly to the non-master branch. In this case, a `release-note-*` -label is optional (and not enforced). +label is required for that non-master PR. 1. New labels added to github: `release-note-none`, maybe others for new release note categories - see Layout section below 1. A [new munger](https://github.com/kubernetes/kubernetes/issues/23409) that will: