Skip to content

Commit

Permalink
Merge branch 'hiertune' into epex4+epoll1
Browse files Browse the repository at this point in the history
ctiller committed May 1, 2017
2 parents b72a74a + 50da5ec commit c610985
Showing 90 changed files with 2,374 additions and 568 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -14,9 +14,6 @@
[submodule "third_party/boringssl"]
path = third_party/boringssl
url = https://github.com/google/boringssl.git
[submodule "third_party/thrift"]
path = third_party/thrift
url = https://github.com/apache/thrift.git
[submodule "third_party/benchmark"]
path = third_party/benchmark
url = https://github.com/google/benchmark
2 changes: 2 additions & 0 deletions BUILD
Original file line number Diff line number Diff line change
@@ -1211,12 +1211,14 @@ grpc_cc_library(
"src/core/tsi/fake_transport_security.c",
"src/core/tsi/ssl_transport_security.c",
"src/core/tsi/transport_security.c",
"src/core/tsi/transport_security_adapter.c",
],
hdrs = [
"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_adapter.h",
"src/core/tsi/transport_security_interface.h",
],
external_deps = [
Loading

0 comments on commit c610985

Please sign in to comment.