Skip to content

Update tikv-configuration-file.md#2951

Merged
CaitinChen merged 8 commits into
pingcap:masterfrom
TomShawn:tikvcongis-pes
Jun 28, 2020
Merged

Update tikv-configuration-file.md#2951
CaitinChen merged 8 commits into
pingcap:masterfrom
TomShawn:tikvcongis-pes

Conversation

@TomShawn
Copy link
Copy Markdown
Contributor

@TomShawn TomShawn commented Jun 18, 2020 •
edited
Loading

What is changed, added or deleted? (Required)

Update TiKV configuration file about pessimistic transaction.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

@TomShawn TomShawn added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-4.0 special-week PR from Document Special Week. labels Jun 18, 2020
@TomShawn TomShawn requested review from yikeke and youjiali1995 June 18, 2020 07:14
@yikeke
Copy link
Copy Markdown
Contributor

yikeke commented Jun 22, 2020

Please help review this PR. @CaitinChen

@yikeke yikeke requested review from CaitinChen and removed request for yikeke June 22, 2020 02:22
CaitinChen
CaitinChen reviewed Jun 24, 2020
View reviewed changes
Comment thread tikv-configuration-file.md Outdated
Comment thread tikv-configuration-file.md Outdated
Comment thread tikv-configuration-file.md Outdated
Comment thread tikv-configuration-file.md Outdated
@TomShawn @CaitinChen
Apply suggestions from code review
95ed03a 
Co-authored-by: Caitin <34535727+CaitinChen@users.noreply.github.com>
TomShawn
TomShawn commented Jun 24, 2020
View reviewed changes
Comment thread tikv-configuration-file.md Outdated
CaitinChen
CaitinChen reviewed Jun 24, 2020
View reviewed changes
Comment thread tikv-configuration-file.md Outdated
TomShawn and others added 2 commits June 24, 2020 15:57
@TomShawn @CaitinChen
Update tikv-configuration-file.md
c0a297d 
Co-authored-by: Caitin <34535727+CaitinChen@users.noreply.github.com>
@CaitinChen
Merge branch 'master' into tikvcongis-pes
f6483bc
CaitinChen
CaitinChen approved these changes Jun 28, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@CaitinChen CaitinChen left a comment

Choose a reason for hiding this comment

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

LGTM

@CaitinChen CaitinChen merged commit c06a841 into pingcap:master Jun 28, 2020
@TomShawn TomShawn deleted the tikvcongis-pes branch June 28, 2020 03:37
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jun 28, 2020
@TomShawn @ti-srebot
cherry pick pingcap#2951 to release-4.0
a3aa9a5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 28, 2020
Merged
5 tasks
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Jun 28, 2020

cherry pick to release-4.0 in PR #3047

TomShawn added a commit that referenced this pull request Jun 28, 2020
@ti-srebot @TomShawn
cherry pick #2951 to release-4.0 (#3047)
173483e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@CaitinChen CaitinChen CaitinChen approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

special-week PR from Document Special Week. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@TomShawn @yikeke @ti-srebot @youjiali1995 @CaitinChen