summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 15:55:14 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-28 15:55:14 +0000
commit1240cd0aefd0fcf3bd99cd1f9bee3f7660bf311b (patch)
tree251bbae67ac009f2ada86eabd2e2dca3fa135014 /version.h
parentf45d9dd1043ea1bde1a0e917e13a2aec3e5c06cd (diff)
merge revision(s) 54005: [Backport #12150]
* test/socket/test_addrinfo.rb (test_ipv6_address_predicates): IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken on AIX, so skip related tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54327 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 a9b379e148..6b291da1fd 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.5"
#define RUBY_RELEASE_DATE "2016-03-29"
-#define RUBY_PATCHLEVEL 269
+#define RUBY_PATCHLEVEL 270
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3