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.gemspec

diff --git a/grpc.gemspec b/grpc.gemspec
index a3e4cbe..317b6cc 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -73,7 +73,7 @@
   s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h )
   s.files += %w( include/grpc/impl/codegen/atm_windows.h )
-  s.files += %w( include/grpc/impl/codegen/exec_ctx_fwd.h )
+  s.files += %w( include/grpc/impl/codegen/gpr_slice.h )
   s.files += %w( include/grpc/impl/codegen/gpr_types.h )
   s.files += %w( include/grpc/impl/codegen/port_platform.h )
   s.files += %w( include/grpc/impl/codegen/slice.h )
@@ -149,6 +149,7 @@
   s.files += %w( include/grpc/impl/codegen/byte_buffer_reader.h )
   s.files += %w( include/grpc/impl/codegen/compression_types.h )
   s.files += %w( include/grpc/impl/codegen/connectivity_state.h )
+  s.files += %w( include/grpc/impl/codegen/exec_ctx_fwd.h )
   s.files += %w( include/grpc/impl/codegen/grpc_types.h )
   s.files += %w( include/grpc/impl/codegen/propagation_bits.h )
   s.files += %w( include/grpc/impl/codegen/status.h )
@@ -156,7 +157,7 @@
   s.files += %w( include/grpc/impl/codegen/atm_gcc_atomic.h )
   s.files += %w( include/grpc/impl/codegen/atm_gcc_sync.h )
   s.files += %w( include/grpc/impl/codegen/atm_windows.h )
-  s.files += %w( include/grpc/impl/codegen/exec_ctx_fwd.h )
+  s.files += %w( include/grpc/impl/codegen/gpr_slice.h )
   s.files += %w( include/grpc/impl/codegen/gpr_types.h )
   s.files += %w( include/grpc/impl/codegen/port_platform.h )
   s.files += %w( include/grpc/impl/codegen/slice.h )