diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
| commit | 74071cdab0c9a4016c05d371fdf1ec0d772ed0b7 (patch) | |
| tree | 4cd5b95b661ddcdc33729622d5fdb63be4bb4f3a /gRPC.podspec | |
| parent | 92b74082811902e4ab9482a5229defd3014aad3f (diff) | |
| parent | b48dda25913fbf6fcb0a7c86ecc364beb31ff43b (diff) | |
Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into ccmerge
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 3845539c5d..bf4ce966e6 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -168,6 +168,7 @@ Pod::Spec.new do |s| 'src/core/ext/census/mlog.h', 'src/core/ext/census/rpc_metric_id.h', 'src/core/ext/client_config/client_channel.h', + 'src/core/ext/client_config/client_channel_factory.h', 'src/core/ext/client_config/client_config.h', 'src/core/ext/client_config/connector.h', 'src/core/ext/client_config/initial_connect_string.h', @@ -178,7 +179,6 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_config/subchannel.h', - 'src/core/ext/client_config/subchannel_factory.h', 'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/uri_parser.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', @@ -320,6 +320,7 @@ Pod::Spec.new do |s| 'src/core/ext/census/tracing.c', 'src/core/ext/client_config/channel_connectivity.c', 'src/core/ext/client_config/client_channel.c', + 'src/core/ext/client_config/client_channel_factory.c', 'src/core/ext/client_config/client_config.c', 'src/core/ext/client_config/connector.c', 'src/core/ext/client_config/default_initial_connect_string.c', @@ -331,7 +332,6 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/resolver_factory.c', 'src/core/ext/client_config/resolver_registry.c', 'src/core/ext/client_config/subchannel.c', - 'src/core/ext/client_config/subchannel_factory.c', 'src/core/ext/client_config/subchannel_index.c', 'src/core/ext/client_config/uri_parser.c', 'src/core/ext/lb_policy/grpclb/load_balancer_api.c', @@ -491,6 +491,7 @@ Pod::Spec.new do |s| 'src/core/ext/census/mlog.h', 'src/core/ext/census/rpc_metric_id.h', 'src/core/ext/client_config/client_channel.h', + 'src/core/ext/client_config/client_channel_factory.h', 'src/core/ext/client_config/client_config.h', 'src/core/ext/client_config/connector.h', 'src/core/ext/client_config/initial_connect_string.h', @@ -501,7 +502,6 @@ Pod::Spec.new do |s| 'src/core/ext/client_config/resolver_factory.h', 'src/core/ext/client_config/resolver_registry.h', 'src/core/ext/client_config/subchannel.h', - 'src/core/ext/client_config/subchannel_factory.h', 'src/core/ext/client_config/subchannel_index.h', 'src/core/ext/client_config/uri_parser.h', 'src/core/ext/lb_policy/grpclb/load_balancer_api.h', |