diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-09-08 10:46:23 -0700 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2017-09-08 10:46:23 -0700 |
commit | a0a9ca485af1344f90b45b9b8d9c13f2b2f28964 (patch) | |
tree | d8a60e03431d61285b1f7c74e0371194b6ea7490 /gRPC-Core.podspec | |
parent | ca3c1c05ebad2b77f0c16c9f424ef42d5198cfd9 (diff) | |
parent | 1a4b3acff0258da57c0b11a27faceb0b51905b9b (diff) |
Merge branch 'master' of https://github.com/grpc/grpc into ctocc
Diffstat (limited to 'gRPC-Core.podspec')
-rw-r--r-- | gRPC-Core.podspec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index fdab4b3f81..2f1f415866 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -443,8 +443,8 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h', - 'src/core/ext/filters/load_reporting/load_reporting.h', - 'src/core/ext/filters/load_reporting/load_reporting_filter.h', + 'src/core/ext/filters/load_reporting/server_load_reporting_filter.h', + 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h', 'src/core/ext/census/aggregation.h', 'src/core/ext/census/base_resources.h', 'src/core/ext/census/census_interface.h', @@ -701,8 +701,8 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper_fallback.c', 'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.c', 'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.c', - 'src/core/ext/filters/load_reporting/load_reporting.c', - 'src/core/ext/filters/load_reporting/load_reporting_filter.c', + 'src/core/ext/filters/load_reporting/server_load_reporting_filter.c', + 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.c', 'src/core/ext/census/base_resources.c', 'src/core/ext/census/context.c', 'src/core/ext/census/gen/census.pb.c', @@ -938,8 +938,8 @@ Pod::Spec.new do |s| 'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver.h', 'src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h', - 'src/core/ext/filters/load_reporting/load_reporting.h', - 'src/core/ext/filters/load_reporting/load_reporting_filter.h', + 'src/core/ext/filters/load_reporting/server_load_reporting_filter.h', + 'src/core/ext/filters/load_reporting/server_load_reporting_plugin.h', 'src/core/ext/census/aggregation.h', 'src/core/ext/census/base_resources.h', 'src/core/ext/census/census_interface.h', |