diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-01-08 12:33:22 -0800 |
| commit | 8b791a4a7f784fb367af6e56c2596c578e974338 (patch) | |
| tree | ab7baa05c08aeac191768fadc766866434beb36b /gRPC.podspec | |
| parent | c357749b48720e00bce57c26acb2195047d63263 (diff) | |
| parent | b47eab53dec9a6d811ad26e0873dc7ec1bac7d46 (diff) | |
Merged from master and resolved merge conflicts
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 1e2925d42a..97e13c0d30 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -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', @@ -451,6 +452,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', |