summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Lowdermilk <jeffml@google.com>2016-01-15 10:55:24 -0800
committerJeff Lowdermilk <jeffml@google.com>2016-02-08 10:01:32 -0800
commitf3bc3b0fddaf4c8377d4fcc9436efe6ea50d1468 (patch)
treedb749723c539cae0c02072bfea19fb409e83ce03
parent44d43e314ce99cada01aea5133d82b3424cd5223 (diff)
Add workflow diagram to pull request doc
-rw-r--r--pr_workflow.diabin0 -> 1987 bytes
-rw-r--r--pr_workflow.pngbin0 -> 27835 bytes
-rw-r--r--pull-requests.md7
3 files changed, 5 insertions, 2 deletions
diff --git a/pr_workflow.dia b/pr_workflow.dia
new file mode 100644
index 00000000..d520c21d
--- /dev/null
+++ b/pr_workflow.dia
Binary files differ
diff --git a/pr_workflow.png b/pr_workflow.png
new file mode 100644
index 00000000..dc95a366
--- /dev/null
+++ b/pr_workflow.png
Binary files differ
diff --git a/pull-requests.md b/pull-requests.md
index eaffce23..b0fb7385 100644
--- a/pull-requests.md
+++ b/pull-requests.md
@@ -34,8 +34,7 @@ Documentation for other releases can be found at
Pull Request Process
====================
-An overview of how we will manage old or out-of-date pull requests.
-
+An overview of how we will manage old or out-of-date pull requests.k
Process
-------
@@ -51,6 +50,10 @@ We want to limit the total number of PRs in flight to:
Life of a Pull Request
----------------------
+### Visual overview
+
+![PR workflow](pr_workflow.png)
+
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-rotations) manually or the [github "munger"](https://github.com/kubernetes/contrib/tree/master/mungegithub) submit-queue plugin automatically will manage merging PRs.