Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optimistic-transaction: remove reference to being "default" #3146

Merged
6 commits merged into from Jul 8, 2020
Merged

optimistic-transaction: remove reference to being "default" #3146

6 commits merged into from Jul 8, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jul 3, 2020

What is changed, added or deleted? (Required)

The documentation claimed optimistic transactions are the default. This is only true for v2.1.

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)?

  • This PR is translated from:
  • Other reference link(s):

@ti-srebot ti-srebot added the contribution This PR is from a community contributor. label Jul 3, 2020
@CLAassistant
Copy link

CLAassistant commented Jul 3, 2020

CLA assistant check
All committers have signed the CLA.

@TomShawn TomShawn requested a review from jackysp July 6, 2020 14:50
@TomShawn TomShawn self-assigned this Jul 6, 2020
@TomShawn TomShawn added needs-cherry-pick-3.0 size/small Changes of a small size. translation/doing This PR's assignee is translating this PR. labels Jul 6, 2020
optimistic-transaction.md Outdated Show resolved Hide resolved
Null not nil and others added 2 commits July 7, 2020 09:14
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 8, 2020
@ti-srebot
Copy link
Contributor

@jackysp,Thanks for your review.

optimistic-transaction.md Outdated Show resolved Hide resolved
Null not nil and others added 2 commits July 8, 2020 07:28
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@ghost ghost added the status/can-merge Indicates a PR has been approved by a committer. label Jul 8, 2020
@ti-srebot
Copy link
Contributor

Sorry @nullnotnil, you don't have permission to trigger auto merge event on this branch. You are not a committer or co-leader or leader for the related sigs:docs(slack).

@ghost ghost merged commit e65391c into pingcap:master Jul 8, 2020
@ghost ghost deleted the update-optimistic-trx branch July 8, 2020 14:15
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.0 in PR #3202

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-3.1 in PR #3203

ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3204

ghost pushed a commit that referenced this pull request Jul 8, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Null not nil <67764674+nullnotnil@users.noreply.github.com>
ghost pushed a commit that referenced this pull request Jul 8, 2020
…3203)

* cherry pick #3146 to release-3.1

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

* Update optimistic-transaction.md

Co-authored-by: Null not nil <67764674+nullnotnil@users.noreply.github.com>
ghost pushed a commit that referenced this pull request Jul 8, 2020
…3202)

* cherry pick #3146 to release-3.0

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

* Update optimistic-transaction.md

Co-authored-by: Null not nil <67764674+nullnotnil@users.noreply.github.com>
@yikeke yikeke assigned Joyinqin and unassigned TomShawn Jul 20, 2020
@Joyinqin
Copy link
Contributor

/unlabel translation/doing

@ti-srebot ti-srebot removed the translation/doing This PR's assignee is translating this PR. label Jul 23, 2020
@Joyinqin
Copy link
Contributor

/label translation/done

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution This PR is from a community contributor. size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants