commit b995e8bcdabd5e40bf5384a64ee57e83cc9691ff
author Craig Tiller <ctiller@google.com> Mon Dec 12 06:36:43 2016 -0800
committer Craig Tiller <ctiller@google.com> Mon Dec 12 06:36:43 2016 -0800
tree 4c1441e5648faad865e7480d36b063882e9fd77b
parent 298d481f1e8348cb7713d53a26fc2c41eb9d8f7c
parent b62bffbea5eef106bfbe644e8af161889c927401

Merge github.com:grpc/grpc into slice_with_exec_ctx

gRPC-Core.podspec

diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index cdda52f..ddcd34d 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -146,7 +146,7 @@
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
                       'include/grpc/impl/codegen/atm_gcc_sync.h',
                       'include/grpc/impl/codegen/atm_windows.h',
-                      'include/grpc/impl/codegen/exec_ctx_fwd.h',
+                      'include/grpc/impl/codegen/gpr_slice.h',
                       'include/grpc/impl/codegen/gpr_types.h',
                       'include/grpc/impl/codegen/port_platform.h',
                       'include/grpc/impl/codegen/slice.h',
@@ -166,6 +166,7 @@
                       'include/grpc/impl/codegen/byte_buffer_reader.h',
                       'include/grpc/impl/codegen/compression_types.h',
                       'include/grpc/impl/codegen/connectivity_state.h',
+                      'include/grpc/impl/codegen/exec_ctx_fwd.h',
                       'include/grpc/impl/codegen/grpc_types.h',
                       'include/grpc/impl/codegen/propagation_bits.h',
                       'include/grpc/impl/codegen/status.h',
@@ -173,7 +174,7 @@
                       'include/grpc/impl/codegen/atm_gcc_atomic.h',
                       'include/grpc/impl/codegen/atm_gcc_sync.h',
                       'include/grpc/impl/codegen/atm_windows.h',
-                      'include/grpc/impl/codegen/exec_ctx_fwd.h',
+                      'include/grpc/impl/codegen/gpr_slice.h',
                       'include/grpc/impl/codegen/gpr_types.h',
                       'include/grpc/impl/codegen/port_platform.h',
                       'include/grpc/impl/codegen/slice.h',