aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Tim Emiola <temiola@google.com>2015-01-29 15:47:50 -0800
committerGravatar Tim Emiola <temiola@google.com>2015-01-31 17:55:23 -0800
commit554a11c0188718cababd06e95664403c39e15e91 (patch)
tree4e022ed46708bbc80e024947ce33abddb9a992d2
parentc4e09f667b0f58821ce137761deb4a62f8b5a3f0 (diff)
completes merges
-rwxr-xr-x[-rw-r--r--]src/ruby/bin/math.rb0
-rwxr-xr-x[-rw-r--r--]src/ruby/bin/math_services.rb0
-rwxr-xr-xsrc/ruby/grpc.gemspec6
3 files changed, 3 insertions, 3 deletions
diff --git a/src/ruby/bin/math.rb b/src/ruby/bin/math.rb
index 09d1e98586..09d1e98586 100644..100755
--- a/src/ruby/bin/math.rb
+++ b/src/ruby/bin/math.rb
diff --git a/src/ruby/bin/math_services.rb b/src/ruby/bin/math_services.rb
index f6ca6fe060..f6ca6fe060 100644..100755
--- a/src/ruby/bin/math_services.rb
+++ b/src/ruby/bin/math_services.rb
diff --git a/src/ruby/grpc.gemspec b/src/ruby/grpc.gemspec
index ffd084dc91..f615945b79 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'