Merge branch 'master' of github.com:grpc/grpc into sanity

Conflicts: tools/run_tests/run_tests.py
narzolliam · Apr 10, 2015 · a9ef765 · a9ef765
2 parents 9f72864 + e2ecc50
commit a9ef765
Show file tree

Hide file tree

Showing 274 changed files with 10,302 additions and 4,244 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -11,4 +11,4 @@
  branch = v3.0.0-alpha-1
 [submodule "third_party/gflags"]
  path = third_party/gflags
- url = https://code.google.com/p/gflags
+ url = https://github.com/gflags/gflags.git
diff --git a/.travis.yml b/.travis.yml
@@ -20,9 +20,12 @@ env:
  - CONFIG=opt TEST=python
  - CONFIG=gcov TEST=c
  - CONFIG=gcov TEST=c++
+ - USE_GCC=4.4 CONFIG=opt TEST=build
+ - USE_GCC=4.5 CONFIG=opt TEST=build
 script:
  - rvm use $RUBY_VERSION
  - gem install bundler
+ - if [ ! -z "$USE_GCC" ] ; then export CC=gcc-$USE_GCC ; export CXX=g++-$USE_GCC ; fi
  - ./tools/run_tests/run_tests.py -l $TEST -t -j 16 -c $CONFIG -s 4.0
 after_success:
  - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens -b. --gcov-options '\-p' ; fi