From 554a11c0188718cababd06e95664403c39e15e91 Mon Sep 17 00:00:00 2001 From: Tim Emiola Date: Thu, 29 Jan 2015 15:47:50 -0800 Subject: [PATCH] completes merges --- src/ruby/bin/math.rb | 0 src/ruby/bin/math_services.rb | 0 src/ruby/grpc.gemspec | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) mode change 100644 => 100755 src/ruby/bin/math.rb mode change 100644 => 100755 src/ruby/bin/math_services.rb diff --git a/src/ruby/bin/math.rb b/src/ruby/bin/math.rb old mode 100644 new mode 100755 diff --git a/src/ruby/bin/math_services.rb b/src/ruby/bin/math_services.rb old mode 100644 new mode 100755 diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec index ffd084dc912..f615945b797 100755 --- a/src/ruby/grpc.gemspec +++ b/src/ruby/grpc.gemspec @@ -19,11 +19,11 @@ Gem::Specification.new do |s| s.require_paths = ['lib'] s.platform = Gem::Platform::RUBY - s.add_dependency 'xray' - s.add_dependency 'logging', '~> 1.8' s.add_dependency 'google-protobuf', '~> 3.0.0alpha.1.1' - s.add_dependency 'signet', '~> 0.5.1' + s.add_dependency 'logging', '~> 1.8' s.add_dependency 'minitest', '~> 5.4' # reqd for interop tests + s.add_dependency 'signet', '~> 0.6.0' + s.add_dependency 'xray', '~> 1.1' s.add_development_dependency 'bundler', '~> 1.7' s.add_development_dependency 'rake', '~> 10.0'