summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork8s-ci-robot <k8s-ci-robot@users.noreply.github.com>2018-03-14 15:52:02 -0700
committerGitHub <noreply@github.com>2018-03-14 15:52:02 -0700
commit65aafdfd77928ac0b9675133881a3ac788246332 (patch)
tree1004716fc90f748dd529675e4e448cc8224c505e
parent56005d414c3661d466514dfad5b6b58c2a64dc4d (diff)
parent261cb0fd089b64002c91e8eddceebf032462ccd6 (diff)
Merge pull request #1927 from liubin/change-merge-robot-to-ci-robot
Change k8s-merge-robot to k8s-ci-robot
-rw-r--r--contributors/devel/gubernator.md2
-rw-r--r--contributors/guide/pull-requests.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/contributors/devel/gubernator.md b/contributors/devel/gubernator.md
index 8d5a899c..b03d11a1 100644
--- a/contributors/devel/gubernator.md
+++ b/contributors/devel/gubernator.md
@@ -30,7 +30,7 @@ Gubernator runs on Google App Engine and fetches logs stored on Google Cloud Sto
### Test Failures list
-Issues made by k8s-merge-robot will post a link to a page listing the failed tests.
+Comments made by k8s-ci-robot will post a link to a page listing the failed tests.
Each failed test comes with the corresponding error log from a junit file and a link
to filter logs for that test.
diff --git a/contributors/guide/pull-requests.md b/contributors/guide/pull-requests.md
index ef50efb7..21a4ddf6 100644
--- a/contributors/guide/pull-requests.md
+++ b/contributors/guide/pull-requests.md
@@ -67,7 +67,7 @@ in a checklist in the pull request description.*
Here's the process the pull request goes through on its way from submission to merging:
1. Make the pull request
-1. `@k8s-merge-robot` assigns reviewers
+1. `@k8s-ci-robot` assigns reviewers
1. If you're **not** a member of the Kubernetes organization, a Reviewer/Kubernetes Member checks that the pull request is safe to test. If so, they comment `/ok-to-test`. Pull requests by Kubernetes organization [members](/community-membership.md) do not need this step. Now the pull request is considered to be trusted, and the pre-submit tests will run: