diff options
| author | Kubernetes Submit Queue <k8s-merge-robot@users.noreply.github.com> | 2017-09-22 16:51:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-22 16:51:45 -0700 |
| commit | d196a4f0a28ab71811d692e1e0b735ec92d4fb6b (patch) | |
| tree | 1e58984fa1af1294010790a1a2d5e855db325b17 | |
| parent | 8bcb6e13558f7c68ad2872d94d53b20a868ca2bc (diff) | |
| parent | 7412af35cdce439728c0e76042a84058f98eff94 (diff) | |
Merge pull request #1110 from xiangpengzhao/update-doc
Automatic merge from submit-queue. .
Update merge requirements in doc
fixes: https://github.com/kubernetes/community/pull/1016#issuecomment-330992673
/cc @spiffxp
| -rw-r--r-- | contributors/devel/automation.md | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/contributors/devel/automation.md b/contributors/devel/automation.md index 4f20b707..0e250277 100644 --- a/contributors/devel/automation.md +++ b/contributors/devel/automation.md @@ -37,19 +37,9 @@ The status of the submit-queue is [online.](http://submit-queue.k8s.io/) The submit-queue lists what it believes are required on the [merge requirements tab](http://submit-queue.k8s.io/#/info) of the info page. That may be more up to date. -A PR is considered "ready for merging" if it matches the following: - * The PR must have the label `cncf-cla: yes` or `cla: human-approved` - * The PR must be mergeable, aka cannot need a rebase - * All of the required github CI tests must be green. The current list of tests are on the [MERGE REQUIREMENTS tab, at this link](https://submit-queue.k8s.io/#/info) - * The PR cannot have any prohibited future milestones (such as a v1.5 milestone during v1.4 code freeze) - * The PR must have the `lgtm` label. The `lgtm` label is automatically applied - following a review comment consisting of `/lgtm` (case-insensitive) in a single line - * The PR must not have been updated since the `lgtm` label was applied - * The PR must have the `approved` label. The `approved` label is automatically - applied after all approvers have approved the PR by a comment consisting of - `/approve` (case-insensitive) in a single line - * The PR must not have the `do-not-merge` label or any of other `do-not-merge/*` - labels, e.g., `do-not-merge/release-note-label-needed` +A PR is considered "ready for merging" by the submit queue if it matches the set +of conditions listed in the merge requirements tab mentioned above. +Please visit that page for more details. ### Merge process |