Merge github.com:grpc/grpc into travis-c++

Conflicts: .travis.yml
mohits · Feb 27, 2015 · 341e660 · 341e660
2 parents d6465fc + 878e4b6
commit 341e660
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,9 @@ before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libgtest-dev libgflags-dev
 script:
-  - ./tools/run_tests/run_tests.py -l c -t -j 8 -c dbg
-  - ./tools/run_tests/run_tests.py -l c -t -j 8 -c opt
-  - ./tools/run_tests/run_tests.py -l c++ -t -j 8 -c dbg
-  - ./tools/run_tests/run_tests.py -l c++ -t -j 8 -c opt
+  - ./tools/run_tests/run_tests.py -l c -t -j 16 -c dbg
+  - ./tools/run_tests/run_tests.py -l c -t -j 16 -c opt
+  - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c dbg
+  - ./tools/run_tests/run_tests.py -l c++ -t -j 16 -c opt
 notifications:
   email: false