summaryrefslogtreecommitdiff
path: root/pull-requests.md
diff options
context:
space:
mode:
authork8s-merge-robot <k8s.production.user@gmail.com>2015-11-12 23:42:26 -0800
committerk8s-merge-robot <k8s.production.user@gmail.com>2015-11-12 23:42:26 -0800
commit9e0297f60f52cc17e238cbe2e9ca0ef797d87782 (patch)
tree7c07d01ecfbf369cc62b9b6bea37ccf64b633cb3 /pull-requests.md
parent5be17e88acea97c08aefd7060a19bf3e1e334d62 (diff)
parent202e7b6567f7aefd2abd9058ae3cdc7ffb4bfe5d (diff)
Merge pull request #16246 from rwehner/fix-submit-queue-links
Auto commit by PR queue bot
Diffstat (limited to 'pull-requests.md')
-rw-r--r--pull-requests.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/pull-requests.md b/pull-requests.md
index 7b955b3d..15a0f447 100644
--- a/pull-requests.md
+++ b/pull-requests.md
@@ -52,14 +52,14 @@ Life of a Pull Request
Unless in the last few weeks of a milestone when we need to reduce churn and stabilize, we aim to be always accepting pull requests.
-Either the [on call](https://github.com/kubernetes/kubernetes/wiki/Kubernetes-on-call-rotation) manually or the [submit queue](https://github.com/kubernetes/contrib/tree/master/submit-queue) automatically will manage merging PRs.
+Either the [on call](https://github.com/kubernetes/kubernetes/wiki/Kubernetes-on-call-rotations) manually or the [github "munger"](https://github.com/kubernetes/contrib/tree/master/mungegithub) submit-queue plugin automatically will manage merging PRs.
-There are several requirements for the submit queue to work:
+There are several requirements for the submit-queue to work:
* Author must have signed CLA ("cla: yes" label added to PR)
* No changes can be made since last lgtm label was applied
* k8s-bot must have reported the GCE E2E build and test steps passed (Travis, Shippable and Jenkins build)
-Additionally, for infrequent or new contributors, we require the on call to apply the "ok-to-merge" label manually. This is gated by the [whitelist](https://github.com/kubernetes/contrib/tree/master/submit-queue/whitelist.txt).
+Additionally, for infrequent or new contributors, we require the on call to apply the "ok-to-merge" label manually. This is gated by the [whitelist](https://github.com/kubernetes/contrib/blob/master/mungegithub/whitelist.txt).
Automation
----------