diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 09:33:52 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-01-31 09:34:46 +0100 |
| commit | cf37cb9f9eca32ebf9bb52b8a58b83924f081dbd (patch) | |
| tree | 4eecb7eb1b60f0488647ae9722f3ed7b266c6e09 /grpc.gemspec | |
| parent | 09ac0a46f4ba899bea09c7d4da8dc7c1540f9978 (diff) | |
| parent | fa132c2f560f6cb6ce42322f446f2d61205e88f6 (diff) | |
Merge branch 'census-placeholders' into make-ruby-installable
Conflicts:
package.json
tools/doxygen/Doxyfile.core.internal
Diffstat (limited to 'grpc.gemspec')
| -rwxr-xr-x | grpc.gemspec | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 47af8eeca9..da9694bc8a 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |s| s.files = %w( Makefile ) s.files += %w( etc/roots.pem ) - s.files += %w( tools/distrib/docker_for_windows.rb ) + s.files += %w( tools/distrib/grpc/docker_for_windows.rb ) s.files += Dir.glob('src/ruby/bin/**/*') s.files += Dir.glob('src/ruby/ext/**/*') s.files += Dir.glob('src/ruby/lib/**/*') @@ -436,6 +436,7 @@ Gem::Specification.new do |s| s.files += %w( src/core/census/context.c ) s.files += %w( src/core/census/initialize.c ) s.files += %w( src/core/census/operation.c ) + s.files += %w( src/core/census/placeholders.c ) s.files += %w( src/core/census/tag_set.c ) s.files += %w( src/core/census/tracing.c ) s.files += %w( third_party/boringssl/crypto/aes/internal.h ) |