diff options
| author |  Alistair Veitch <aveitch@google.com> | 2015-08-04 17:47:11 -0700 |
|---|---|---|
| committer | Alistair Veitch <aveitch@google.com> | 2015-08-04 17:47:11 -0700 |
| commit | a924b31d28ad907ebc040dd63945356011f613f6 (patch) | |
| tree | 460ca81d36aa93cb9efdedf971cc29a7cc7a59db /gRPC.podspec | |
| parent | 0383d494c4fd0c97a113359348d5136b641c789f (diff) | |
| parent | 80aecf609b54aeb0677461cae771362b5affe173 (diff) | |
merge with upstream/master
Diffstat (limited to 'gRPC.podspec')
| -rw-r--r-- | gRPC.podspec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gRPC.podspec b/gRPC.podspec index 63394dbd39..775fbfda5e 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -151,7 +151,6 @@ Pod::Spec.new do |s| 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/transport_security.h', 'src/core/tsi/transport_security_interface.h', - 'src/core/census/grpc_context.h', 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', @@ -173,6 +172,8 @@ Pod::Spec.new do |s| 'src/core/client_config/resolvers/sockaddr_resolver.h', 'src/core/client_config/subchannel.h', 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/subchannel_factory_decorators/add_channel_arg.h', + 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.h', 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', @@ -300,6 +301,8 @@ Pod::Spec.new do |s| 'src/core/client_config/resolvers/sockaddr_resolver.c', 'src/core/client_config/subchannel.c', 'src/core/client_config/subchannel_factory.c', + 'src/core/client_config/subchannel_factory_decorators/add_channel_arg.c', + 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.c', 'src/core/client_config/uri_parser.c', 'src/core/compression/algorithm.c', 'src/core/compression/message_compress.c', @@ -352,6 +355,7 @@ Pod::Spec.new do |s| 'src/core/surface/call_details.c', 'src/core/surface/call_log_batch.c', 'src/core/surface/channel.c', + 'src/core/surface/channel_connectivity.c', 'src/core/surface/channel_create.c', 'src/core/surface/completion_queue.c', 'src/core/surface/event_string.c', @@ -418,7 +422,6 @@ Pod::Spec.new do |s| 'src/core/tsi/ssl_transport_security.h', 'src/core/tsi/transport_security.h', 'src/core/tsi/transport_security_interface.h', - 'src/core/census/grpc_context.h', 'src/core/channel/census_filter.h', 'src/core/channel/channel_args.h', 'src/core/channel/channel_stack.h', @@ -440,6 +443,8 @@ Pod::Spec.new do |s| 'src/core/client_config/resolvers/sockaddr_resolver.h', 'src/core/client_config/subchannel.h', 'src/core/client_config/subchannel_factory.h', + 'src/core/client_config/subchannel_factory_decorators/add_channel_arg.h', + 'src/core/client_config/subchannel_factory_decorators/merge_channel_args.h', 'src/core/client_config/uri_parser.h', 'src/core/compression/message_compress.h', 'src/core/debug/trace.h', |