diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-21 10:24:15 -0800 |
| commit | a8453a20d8565ad63ca9ebcdc1b981400a7b09a0 (patch) | |
| tree | b554248cd31da09f9120ead2fe9e6eca23ccfa68 /gRPC-C++.podspec | |
| parent | 57c52eebce27bd104ae130e72c3833f361b11919 (diff) | |
| parent | 5262c087d88123c0f69603f42b6401a4b8fa9282 (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'gRPC-C++.podspec')
| -rw-r--r-- | gRPC-C++.podspec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 74f43a3aa7..4c24ec2ff2 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -339,10 +339,10 @@ Pod::Spec.new do |s| 'src/core/lib/security/credentials/oauth2/oauth2_credentials.h', 'src/core/lib/security/credentials/plugin/plugin_credentials.h', 'src/core/lib/security/credentials/ssl/ssl_credentials.h', + 'src/core/lib/security/security_connector/security_connector.h', 'src/core/lib/security/transport/auth_filters.h', 'src/core/lib/security/transport/lb_targets_info.h', 'src/core/lib/security/transport/secure_endpoint.h', - 'src/core/lib/security/transport/security_connector.h', 'src/core/lib/security/transport/security_handshaker.h', 'src/core/lib/security/transport/tsi_error.h', 'src/core/lib/security/util/json_util.h', @@ -504,7 +504,6 @@ Pod::Spec.new do |s| 'src/core/lib/transport/transport_impl.h', 'src/core/lib/debug/trace.h', 'src/core/ext/filters/client_channel/lb_policy/grpclb/client_load_reporting_filter.h', - 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h', 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h', 'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h', 'src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h', |