Skip to content

Commit

Permalink
Merge branch 'master' of github.com:grpc/grpc into grpclb_api
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgquintas
dgquintas committed Dec 24, 2015
2 parents 7052ac2 + 7593cff commit 8974a66
Show file tree
Hide file tree
Showing 2,051 changed files with 47,122 additions and 218,749 deletions.
7 changes: 3 additions & 4 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
[submodule "third_party/zlib"]
path = third_party/zlib
url = https://github.com/madler/zlib
[submodule "third_party/openssl"]
path = third_party/openssl
url = https://github.com/openssl/openssl.git
branch = OpenSSL_1_0_2-stable
[submodule "third_party/protobuf"]
path = third_party/protobuf
url = https://github.com/google/protobuf.git
Expand All @@ -15,6 +11,9 @@
[submodule "third_party/googletest"]
path = third_party/googletest
url = https://github.com/google/googletest.git
[submodule "third_party/boringssl"]
path = third_party/boringssl
url = https://boringssl.googlesource.com/boringssl
[submodule "third_party/nanopb"]
path = third_party/nanopb
url = https://github.com/nanopb/nanopb.git
2 changes: 2 additions & 0 deletions BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ cc_library(
"src/core/security/security_context.h",
"src/core/tsi/fake_transport_security.h",
"src/core/tsi/ssl_transport_security.h",
"src/core/tsi/ssl_types.h",
"src/core/tsi/transport_security.h",
"src/core/tsi/transport_security_interface.h",
"src/core/census/grpc_filter.h",
Expand Down Expand Up @@ -1269,6 +1270,7 @@ objc_library(
"src/core/security/security_context.h",
"src/core/tsi/fake_transport_security.h",
"src/core/tsi/ssl_transport_security.h",
"src/core/tsi/ssl_types.h",
"src/core/tsi/transport_security.h",
"src/core/tsi/transport_security_interface.h",
"src/core/census/grpc_filter.h",
Expand Down
23,880 changes: 3,751 additions & 20,129 deletions Makefile
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ libs:
- src/core/security/security_context.h
- src/core/tsi/fake_transport_security.h
- src/core/tsi/ssl_transport_security.h
- src/core/tsi/ssl_types.h
- src/core/tsi/transport_security.h
- src/core/tsi/transport_security_interface.h
src:
Expand Down
2 changes: 2 additions & 0 deletions gRPC.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ Pod::Spec.new do |s|
'src/core/security/security_context.h',
'src/core/tsi/fake_transport_security.h',
'src/core/tsi/ssl_transport_security.h',
'src/core/tsi/ssl_types.h',
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_interface.h',
'src/core/census/grpc_filter.h',
Expand Down Expand Up @@ -461,6 +462,7 @@ Pod::Spec.new do |s|
'src/core/security/security_context.h',
'src/core/tsi/fake_transport_security.h',
'src/core/tsi/ssl_transport_security.h',
'src/core/tsi/ssl_types.h',
'src/core/tsi/transport_security.h',
'src/core/tsi/transport_security_interface.h',
'src/core/census/grpc_filter.h',
Expand Down
Loading

0 comments on commit 8974a66

Please sign in to comment.