diff options
| author | Elvin Efendi <elvin.efendiyev@gmail.com> | 2016-01-04 10:22:00 -0500 |
|---|---|---|
| committer | Elvin Efendi <elvin.efendiyev@gmail.com> | 2016-01-04 10:22:00 -0500 |
| commit | db5545d760a5baad052370504dd03585ac6f3215 (patch) | |
| tree | 1c8923703da25cbc56ad3dea2b59d639c39a5b22 /oxidized.gemspec | |
| parent | ef1a59d2b29df5b00246ee34eba96b0cf4927fa2 (diff) | |
| parent | f112dfa0c604ae1c990f6411a002806924c00bf3 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-upstream
Diffstat (limited to 'oxidized.gemspec')
| -rw-r--r-- | oxidized.gemspec | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/oxidized.gemspec b/oxidized.gemspec index a5d481e..127a2de 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -5,7 +5,11 @@ require 'oxidized/version' Gem::Specification.new do |s| s.name = 'oxidized' +<<<<<<< HEAD s.version = Oxidized::VERSION +======= + s.version = '0.9.0' +>>>>>>> upstream/master s.licenses = %w( Apache-2.0 ) s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ] @@ -21,7 +25,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.9.3' s.add_runtime_dependency 'asetus', '~> 0.1' s.add_runtime_dependency 'slop', '~> 3.5' - s.add_runtime_dependency 'net-ssh', '~> 2.8' + s.add_runtime_dependency 'net-ssh', '~> 2.9', '>= 2.9.3' s.add_runtime_dependency 'rugged', '~> 0.21', '>= 0.21.4' s.add_development_dependency 'pry', '~> 0' s.add_development_dependency 'bundler', '~> 1.10' |