summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-19 10:44:51 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-19 10:44:51 +0000
commit13112e53367035c28600baf4ac416cadb5e60759 (patch)
tree89a301540a6748a3e617c5d95be485c6394c05b0 /version.h
parent1386c9fd3e9f4b10534be6ba23b3d7a43c129588 (diff)
merge revision(s) r48948: [Backport #10591]
* lib/net/http/response.rb (Net::HTTPResponse): require one or more spaces [Bug #10591]. by leriksen <leif.eriksen.au@gmail.com> https://github.com/ruby/ruby/pull/782 fix GH-782 NOTE: graph.facebook.com returns without SP Reason-Phrase. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49652 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 5e68af13f5..693da97b14 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2015-02-19"
-#define RUBY_PATCHLEVEL 298
+#define RUBY_PATCHLEVEL 299
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2