Skip to content

Conversation

@siyu-hu
Copy link
Contributor

@siyu-hu siyu-hu commented Jun 23, 2020

What is changed, added or deleted? (Required)

无法满度->无法满足

sre-bot and others added 30 commits April 15, 2020 12:18
…cap#2737) (pingcap#2754)

* reference: fix typos and refine sql diagnosis related documents

* fix a broken link

Co-authored-by: reafans <30926443+reafans@users.noreply.github.com>

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: reafans <30926443+reafans@users.noreply.github.com>
Co-authored-by: Liangliang Gu <marsishandsome@gmail.com>
Co-authored-by: leoppro <zhaoyilin@pingcap.com>
…ingcap#2787)

Co-authored-by: Liangliang Gu <marsishandsome@gmail.com>
…on (pingcap#2803) (pingcap#2812)

* *: update ansible deployment description to tiup deployment description

* Update README.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
…ingcap#2813) (pingcap#2814)

* get-started: fix some descriptions and typos in tiup quick start doc

* fix a grammar mistake

* fix backticks format

* change 登陆 -> 登录

* update tiup deploy

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
… (pingcap#2815)

* Optimized deploy for tiup docs

* fix some details

* fix some details

* update headings

* Update tiup.md

* fix two links

* remove extra blank lines

* unify code comment format

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>

Co-authored-by: lzs <43946384+superlzs0476@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: yikeke <yikeke@pingcap.com>
…lash in pd (pingcap#2838) (pingcap#2840)

* Add more explanation about how to clear syncing rules in tiflash

* Fix comment

* Update reference/tiflash/maintain.md

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update reference/tiflash/maintain.md

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>

* Update reference/tiflash/maintain.md

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>

* remove weird codes

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Tong Zhigao <solotzg@163.com>

Co-authored-by: lidezhu <47731263+lidezhu@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Tong Zhigao <solotzg@163.com>
ti-srebot and others added 21 commits June 16, 2020 15:14
…tables (pingcap#3617) (pingcap#3677)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: bb7133 <bb7133@gmail.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: disksing <i@disksing.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Arenatlx <ailinsilence4@gmail.com>
pingcap#3692)

* cherry pick pingcap#3626 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update test-deployment-using-docker.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: WangXiangUSTC <wx347249478@gmail.com>
…#3699)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Neil Shen <overvenus@gmail.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Connor <zbk602423539@gmail.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
… (pingcap#3722)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
* add tiup ssh handshake failed faq

add tiup ssh handshake failed faq

* Update tiup/tiup-faq.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

* Update tiup/tiup-faq.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>

* Update tiup/tiup-faq.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Co-authored-by: ti-srebot <66930949+ti-srebot@users.noreply.github.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: july2993 <july2993@gmail.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Allen Zhong <zhongbenli@pingcap.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Sparkle <1284531+baurine@users.noreply.github.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Jack Yu <yusp@pingcap.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Jack Yu <yusp@pingcap.com>
…cap#3779)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: xufei <xufei@pingcap.com>
* cherry pick pingcap#3780 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* fix conflict

Co-authored-by: xufei <xufei@pingcap.com>
Co-authored-by: xufei <xufeixw@mail.ustc.edu.cn>
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: amyangfei <amyangfei@gmail.com>
无法满度->无法满足
@siyu-hu siyu-hu changed the base branch from release-4.0 to master June 23, 2020 09:45
@lilin90 lilin90 added needs-cherry-pick-4.0 size/small Changes of a small size. labels Jun 23, 2020
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@lilin90
Copy link
Member

lilin90 commented Jun 23, 2020

I'll fix the typo in another PR and will close this one.

@lilin90 lilin90 closed this Jun 23, 2020
@lilin90 lilin90 added the translation/no-need No need to translate this PR. label Jun 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/small Changes of a small size. translation/no-need No need to translate this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.