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

Conversation

@shenli
Copy link
Member

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

This comment has been minimized.

Copy link
Member

winoros commented Nov 15, 2017

/run-all-tests

@shenli

This comment has been minimized.

Copy link
Member Author

shenli commented Nov 15, 2017

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

@zimulala

This comment has been minimized.

Copy link
Member

zimulala commented Nov 15, 2017

LGTM

Copy link
Member

winoros left a comment

LGTM

@coocood coocood merged commit 07db8cd into pingcap:release-1.0 Nov 15, 2017
12 checks passed
12 checks passed
ci/circleci Your tests passed on CircleCI!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls First build on release-1.0 at 72.512%
Details
jenkins-ci-tidb/build Jenkins job succeeded.
Details
jenkins-ci-tidb/common-test Jenkins job succeeded.
Details
jenkins-ci-tidb/integration-common-test Jenkins job succeeded.
Details
jenkins-ci-tidb/integration-compatibility-test Jenkins job succeeded.
Details
jenkins-ci-tidb/integration-ddl-test Jenkins job succeeded.
Details
jenkins-ci-tidb/mybatis-test Jenkins job succeeded.
Details
jenkins-ci-tidb/sqllogic-test Jenkins job succeeded.
Details
jenkins-ci-tidb/unit-test Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.