summaryrefslogtreecommitdiff
path: root/pull-requests.md
diff options
context:
space:
mode:
authorRobert Wehner <rcw@wehnerortega.net>2015-10-24 20:02:54 -0600
committerRobert Wehner <rcw@wehnerortega.net>2015-10-24 20:02:54 -0600
commit202e7b6567f7aefd2abd9058ae3cdc7ffb4bfe5d (patch)
treed39ab95ceb46099322a70d59207f115d3d0f8d5c /pull-requests.md
parent536afb79a0231204b351588bed3b7fefa672d2a9 (diff)
Fix dead links to submit-queue
* https://github.com/kubernetes/contrib/pull/122 merged submit-queue into mungegithub. This fixes links to the old submit-queue location. * Standardized to use "submit-queue" instead of "submit queue". Just picked one since both were used. * Fixes dead link to on-call wiki.
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
----------