Skip to content

Commit

Permalink
contribution: Clean up outdated information about bot (tikv#10051)
Browse files Browse the repository at this point in the history
Signed-off-by: hi-rustin <rustin.liu@gmail.com>
  • Loading branch information
Rustin170506 authored Apr 20, 2021
1 parent a345ff7 commit c341362
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit c341362

Please sign in to comment.