summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-17 17:08:26 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-17 17:08:26 +0000
commitfd87a8aebba9f0f7ec4afc2bf7aba5b9d623a23b (patch)
treeaa7d22f797a174f6b5e599d72ad2b4af22cc0aef /version.h
parente6e559c0bb196d608965e52c195773dddb302221 (diff)
merge revision(s) r48563,r46261,r48581: [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_1@49631 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 495a27d724..d60131c2ce 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-02-18"
-#define RUBY_PATCHLEVEL 296
+#define RUBY_PATCHLEVEL 297
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2