From c0dc2ee2af5b6be0b237fa5a6cb60aed14943466 Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Fri, 6 Nov 2015 10:54:31 +0200 Subject: release 0.9.0 --- oxidized.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oxidized.gemspec') diff --git a/oxidized.gemspec b/oxidized.gemspec index d2956b1..1e42e73 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'oxidized' - s.version = '0.8.1' + s.version = '0.9.0' s.licenses = %w( Apache-2.0 ) s.platform = Gem::Platform::RUBY s.authors = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ] -- cgit v1.2.3 From 7e8ce43493581f8dc384b8e09a89edf14df5e413 Mon Sep 17 00:00:00 2001 From: Tyler Christiansen Date: Tue, 29 Dec 2015 23:21:48 -0800 Subject: Update net-ssh version dependecy. Closes #214. --- oxidized.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'oxidized.gemspec') diff --git a/oxidized.gemspec b/oxidized.gemspec index 1e42e73..eef386a 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -16,7 +16,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' end -- cgit v1.2.3 From 1ee130b83a28f822cdc3379c24d4965ceee86034 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Mon, 4 Jan 2016 10:24:46 -0500 Subject: merge version --- lib/oxidized/version.rb | 2 +- oxidized.gemspec | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'oxidized.gemspec') diff --git a/lib/oxidized/version.rb b/lib/oxidized/version.rb index c2a0c0e..38772b7 100644 --- a/lib/oxidized/version.rb +++ b/lib/oxidized/version.rb @@ -1,3 +1,3 @@ module Oxidized - VERSION = '0.8.1' + VERSION = '0.9.0' end diff --git a/oxidized.gemspec b/oxidized.gemspec index 127a2de..83e31cd 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -5,11 +5,7 @@ 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' ] -- cgit v1.2.3 From f339170c877ca296987d66c0c44223a8cad1d338 Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Mon, 4 Jan 2016 10:55:27 -0500 Subject: use latest net-ssh --- Gemfile.lock | 10 +++++----- oxidized.gemspec | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'oxidized.gemspec') diff --git a/Gemfile.lock b/Gemfile.lock index bbdc4c8..b46ca2f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ PATH remote: . specs: - oxidized (0.8.1) + oxidized (0.9.0) asetus (~> 0.1) - net-ssh (~> 2.8) + net-ssh (~> 3.0, >= 3.0.2) rugged (~> 0.21, >= 0.21.4) slop (~> 3.5) @@ -14,10 +14,10 @@ GEM coderay (1.1.0) metaclass (0.0.4) method_source (0.8.2) - minitest (5.8.2) + minitest (5.8.3) mocha (1.1.0) metaclass (~> 0.0.1) - net-ssh (2.9.2) + net-ssh (3.0.2) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -38,4 +38,4 @@ DEPENDENCIES rake (~> 10.0) BUNDLED WITH - 1.10.6 + 1.11.2 diff --git a/oxidized.gemspec b/oxidized.gemspec index 83e31cd..808d508 100644 --- a/oxidized.gemspec +++ b/oxidized.gemspec @@ -21,7 +21,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.9', '>= 2.9.3' + s.add_runtime_dependency 'net-ssh', '~> 3.0', '>= 3.0.2' s.add_runtime_dependency 'rugged', '~> 0.21', '>= 0.21.4' s.add_development_dependency 'pry', '~> 0' s.add_development_dependency 'bundler', '~> 1.10' -- cgit v1.2.3