summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:44:24 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-11-28 07:44:24 +0000
commitdd7f1cdfbd8215ee46c11175bfd2f4fd3569f34a (patch)
tree9f947cbbc3d0ff21012c918a34f6b202719e51e2 /version.h
parent3f23ee7015448fbc33515dd8168c7b4d370c26e4 (diff)
merge revision(s) 48563: [Backport #10533]
* lib/net/http.rb: Do not attempt SSL session resumption when the session is expired. [Bug #10533] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@48636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/version.h b/version.h
index c506ac8f5c..b1fc13278d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-11-28"
-#define RUBY_PATCHLEVEL 605
+#define RUBY_PATCHLEVEL 606
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 11