diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-29 14:24:42 -0800 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-29 14:24:42 -0800 |
| commit | 6c3d040ebf01605082d026fd721f87faacf966b5 (patch) | |
| tree | ad7be6a55579061dbdbf679cba2382039e1996e6 /grpc.gemspec | |
| parent | 95fcb58fc1c3f71e42dd1a7a618d31bf2ae6e43e (diff) | |
| parent | 0610434185cd528b72e5be936075cae4c4a07a8e (diff) | |
Merge branch 'security_handshaker1' into security_handshaker2
Diffstat (limited to 'grpc.gemspec')
| -rwxr-xr-x | grpc.gemspec | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 197da23e3d..9fe6512673 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -29,7 +29,6 @@ Gem::Specification.new do |s| s.add_dependency 'google-protobuf', '~> 3.0.2' s.add_dependency 'googleauth', '~> 0.5.1' - s.add_dependency 'concurrent-ruby' s.add_development_dependency 'bundler', '~> 1.9' s.add_development_dependency 'facter', '~> 2.4' @@ -256,8 +255,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/mdstr_hash_table.h ) s.files += %w( src/core/lib/transport/metadata.h ) s.files += %w( src/core/lib/transport/metadata_batch.h ) - s.files += %w( src/core/lib/transport/method_config.h ) s.files += %w( src/core/lib/transport/pid_controller.h ) + s.files += %w( src/core/lib/transport/service_config.h ) s.files += %w( src/core/lib/transport/static_metadata.h ) s.files += %w( src/core/lib/transport/timeout_encoding.h ) s.files += %w( src/core/lib/transport/transport.h ) @@ -450,8 +449,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/transport/mdstr_hash_table.c ) s.files += %w( src/core/lib/transport/metadata.c ) s.files += %w( src/core/lib/transport/metadata_batch.c ) - s.files += %w( src/core/lib/transport/method_config.c ) s.files += %w( src/core/lib/transport/pid_controller.c ) + s.files += %w( src/core/lib/transport/service_config.c ) s.files += %w( src/core/lib/transport/static_metadata.c ) s.files += %w( src/core/lib/transport/timeout_encoding.c ) s.files += %w( src/core/lib/transport/transport.c ) |