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.

Sign up for GitHub

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

Jump to bottom

store/tikv: revert optimization for optimistic conflicts pessimistic #11051

Merged
merged 1 commit into from
Jul 3, 2019
Merged

store/tikv: revert optimization for optimistic conflicts pessimistic #11051

merged 1 commit into from
Jul 3, 2019

Conversation

coocood
Copy link
Member

@coocood coocood commented Jul 3, 2019

Cherry-pick #11037

Conflict only on the log line.

@coocood
Copy link
Member Author

coocood commented Jul 3, 2019

/run-all-tests

@coocood coocood added the type/bugfix This PR fixes a bug. label Jul 3, 2019
@tiancaiamao
Copy link
Contributor

LGTM

@tiancaiamao tiancaiamao added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 3, 2019
jackysp
jackysp approved these changes Jul 3, 2019
View reviewed changes
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

@jackysp jackysp merged commit aafe172 into pingcap:release-3.0 Jul 3, 2019
@coocood coocood deleted the revert-optimization-3.0 branch July 3, 2019 10:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackysp jackysp jackysp approved these changes

Assignees
No one assigned
Labels
status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@coocood @tiancaiamao @jackysp