merge with master

johnsonlrd · Jun 1, 2015 · f3da552 · f3da552
2 parents 2696762 + 7f61193
commit f3da552
Show file tree

Hide file tree

Showing 388 changed files with 26,424 additions and 3,196 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -8,7 +8,7 @@
 [submodule "third_party/protobuf"]
 	path = third_party/protobuf
 	url = https://github.com/google/protobuf.git
-	branch = v3.0.0-alpha-1
+	branch = v3.0.0-alpha-3
 [submodule "third_party/gflags"]
 	path = third_party/gflags
 	url = https://github.com/gflags/gflags.git
diff --git a/.travis.yml b/.travis.yml
@@ -17,22 +17,24 @@ env:
     - CPPFLAGS=-I/tmp/prebuilt/include
     - NUGET="mono nuget.exe"
   matrix:
-    - CONFIG=opt TEST=sanity
-    - CONFIG=gcov TEST="c c++"
-    - CONFIG=opt TEST="c c++"
-    - CONFIG=opt TEST=node
-    - CONFIG=opt TEST=ruby
-    - CONFIG=opt TEST=python
-    - CONFIG=opt TEST=csharp
-    - USE_GCC=4.4 CONFIG=opt TEST=build
+    - CONFIG=opt TEST=sanity JOBS=1
+    - CONFIG=gcov TEST=c JOBS=16
+    - CONFIG=gcov TEST=c++ JOBS=16
+    - CONFIG=opt TEST=c JOBS=16
+    - CONFIG=opt TEST=c++ JOBS=16
+    - CONFIG=opt TEST=node JOBS=16
+    - CONFIG=opt TEST=ruby JOBS=16
+    - CONFIG=opt TEST=python JOBS=1
+    - CONFIG=opt TEST=csharp JOBS=16
+    - USE_GCC=4.4 CONFIG=opt TEST=build JOBS=16
 script:
   - rvm use $RUBY_VERSION
   - gem install bundler
   - ./tools/run_tests/prepare_travis.sh
   - 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
+  - ./tools/run_tests/run_tests.py -l $TEST -t -j $JOBS -c $CONFIG -s 4.0
 after_success:
-  - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens -b. --gcov-options '\-p' ; fi
+  - if [ "$CONFIG" = "gcov" ] ; then coveralls --exclude third_party --exclude gens --exclude test --exclude src/compiler -b. --gcov-options '\-p' ; fi
 notifications:
   email: false
   webhooks:

diff --git a/BUILD b/BUILD
@@ -131,7 +131,7 @@ cc_library(
     "src/core/httpcli/httpcli.h",
     "src/core/httpcli/httpcli_security_connector.h",
     "src/core/httpcli/parser.h",
-    "src/core/security/auth.h",
+    "src/core/security/auth_filters.h",
     "src/core/security/base64.h",
     "src/core/security/credentials.h",
     "src/core/security/json_token.h",
@@ -229,9 +229,10 @@ cc_library(
     "src/core/httpcli/httpcli.c",
     "src/core/httpcli/httpcli_security_connector.c",
     "src/core/httpcli/parser.c",
-    "src/core/security/auth.c",
     "src/core/security/base64.c",
+    "src/core/security/client_auth_filter.c",
     "src/core/security/credentials.c",
+    "src/core/security/credentials_metadata.c",
     "src/core/security/credentials_posix.c",
     "src/core/security/credentials_win32.c",
     "src/core/security/google_default_credentials.c",
@@ -240,6 +241,7 @@ cc_library(
     "src/core/security/secure_transport_setup.c",
     "src/core/security/security_connector.c",
     "src/core/security/security_context.c",
+    "src/core/security/server_auth_filter.c",
     "src/core/security/server_secure_chttp2.c",
     "src/core/surface/init_secure.c",
     "src/core/surface/secure_channel_create.c",

diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/grpc/grpc.svg?branch=master)](https://travis-ci.org/grpc/grpc)
+[![Coverage Status](https://img.shields.io/coveralls/grpc/grpc.svg)](https://coveralls.io/r/grpc/grpc?branch=master)
 
 [gRPC - An RPC library and framework](http://github.com/grpc/grpc)
 ===================================
@@ -37,7 +38,7 @@ Libraries in different languages are in different state of development. We are s
    * C++ Library: [src/cpp] (src/cpp) : Early adopter ready - Alpha.
    * Ruby Library: [src/ruby] (src/ruby) : Early adopter ready - Alpha.
    * NodeJS Library: [src/node] (src/node) : Early adopter ready - Alpha.
-   * Python Library: [src/python] (src/python) : Usable with limitations - Alpha.
+   * Python Library: [src/python] (src/python) : Early adopter ready - Alpha.
    * PHP Library: [src/php] (src/php) : Pre-Alpha.
    * C# Library: [src/csharp] (src/csharp) : Pre-Alpha.
    * Objective-C Library: [src/objective-c] (src/objective-c): Pre-Alpha.