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

Cherry-Pick some commits from master #5107

Merged
merged 3 commits into from Nov 15, 2017
Merged

Cherry-Pick some commits from master #5107

merged 3 commits into from Nov 15, 2017

Conversation

shenli
Copy link
Member

@shenli shenli commented Nov 14, 2017

server: make tokenLimit configurable (#4973)
executor: add default database to query log (#5078)
ignore DDL statement for query duration metrics (#5093)

@winoros
Copy link
Member

winoros commented Nov 15, 2017

/run-all-tests

@shenli
Copy link
Member Author

shenli commented Nov 15, 2017

/run-all-tests tidb-test=release-1.0

@zimulala
Copy link
Contributor

LGTM

@zimulala zimulala added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 15, 2017
Copy link
Member

@winoros winoros left a comment

Choose a reason for hiding this comment

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

LGTM

@coocood coocood merged commit 07db8cd into pingcap:release-1.0 Nov 15, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants