Merge pull request #322 from mfazekas/310b-preparev3.1.0.beta1

3.1.0beta1 prepare

3 files changed, 16 insertions, 7 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index e9821d9..3fd3e9b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+=== 3.1.0.beta1
+
+* trying to execute something on a not yet opend channel throws nicer messag [Miklos Fazekas]
+* calling close on a not opened channel marks the channel for close [Miklos Fazekas]
+* read keepalive configuration from ssh config files [Miklos Fazekas]
+* send client version on hadshake before waiting for server to reduce handshake time [Miklos Fazekas]
+* allow custom Net::SSH::KnownHosts implementations [Jean Boussier]
+* memoize known host so we only search it once per session [Jean Boussier, Miklos Fazekas]
+
 === 3.0.2
 === 3.0.2.rc1
 
diff --git a/lib/net/ssh/version.rb b/lib/net/ssh/version.rb
index 4220250..6d30d4e 100644
--- a/lib/net/ssh/version.rb
+++ b/lib/net/ssh/version.rb
@@ -48,14 +48,14 @@ module Net; module SSH
     MAJOR = 3
 
     # The minor component of this version of the Net::SSH library
-    MINOR = 0
+    MINOR = 1
 
     # The tiny component of this version of the Net::SSH library
-    TINY  = 2
+    TINY  = 0
 
     # The prerelease component of this version of the Net::SSH library 
     # nil allowed
-    PRE   = nil
+    PRE   = "beta1"
 
     # The current version of the Net::SSH library as a Version instance
     CURRENT = new(*[MAJOR, MINOR, TINY, PRE].compact)
diff --git a/net-ssh.gemspec b/net-ssh.gemspec
index cab977e..8e366b5 100644
--- a/net-ssh.gemspec
+++ b/net-ssh.gemspec
@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: net-ssh 3.0.2 ruby lib
+# stub: net-ssh 3.1.0.beta1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "net-ssh"
-  s.version = "3.0.2"
+  s.version = "3.1.0.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jamis Buck", "Delano Mandelbaum", "Mikl\u{f3}s Fazekas"]
   s.cert_chain = ["net-ssh-public_cert.pem"]
-  s.date = "2015-12-30"
+  s.date = "2016-03-05"
   s.description = "Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2."
   s.email = "net-ssh@solutious.com"
   s.extra_rdoc_files = [