Merge branch 'master' of https://github.com/pingcap/tidb into tune_agg

pingcap · Sep 3, 2018 · 6de6fbd · 6de6fbd
2 parents 87175b2 + 621ca43
commit 6de6fbd
Show file tree

Hide file tree

Showing 170 changed files with 14,225 additions and 6,816 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,19 +3,10 @@ language: go
 go_import_path: github.com/pingcap/tidb
 
 go:
-  - "1.10"
+  - "1.11"
 
-# https://docs.travis-ci.com/user/customizing-the-build/#Rows-that-are-Allowed-to-Fail
 env:
     - TRAVIS_COVERAGE=0
-    - TRAVIS_COVERAGE=1
-
-# Run coverage tests.
-matrix:
-  fast_finish: true
-  allow_failures:
-    - go: "1.10"
-      env: TRAVIS_COVERAGE=1
 
 before_install:  
   # create /logs/unit-test for unit test.