From c341362c699b69bcdedbda8555b95fcd5c0056ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E6=89=8B=E6=8E=89=E5=8C=85=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88?= Date: Wed, 21 Apr 2021 00:05:52 +0800 Subject: [PATCH] contribution: Clean up outdated information about bot (#10051) Signed-off-by: hi-rustin --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ec37e64cb5c..2db5510b97d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,7 +130,7 @@ This is a rough outline of what a contributor's workflow looks like: * If there are conflicts, you can rebase (or merge) and resolve them locally. Then force push to your PR branch. You do not need to get re-review just for resolving conflicts, but you should request re-review if there are significant changes. - Our CI system automatically tests all pull requests. -- Our bot will merge your PR. It can be summoned by commenting `/merge` or adding the `S: CanMerge` label (requires tests to pass and two approvals. You might have to ask your reviewer to do this). +- Our [bot](https://github.com/ti-chi-bot) will merge your PR. It can be summoned by commenting `/merge` (requires tests to pass and two approvals. You might have to ask your reviewer to do this). See [Rustdoc of TiKV](https://tikv.github.io) for TiKV code documentation. @@ -216,7 +216,7 @@ endpoint = "http://localhost:4566" key-id = "KMS key id" ``` -When you run TiKV, make sure to set the localstck credentials +When you run TiKV, make sure to set the localstack credentials ``` export AWS_ACCESS_KEY_ID=test