merge revision(s) 54004: [Backport #12152]

	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
	  The fifth argument to getsockopt(2) should be modified to
	  indicate the actual size of the value on return,
	  but not in AIX. This is a know bug. Skip related tests.

	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
	  ditto.

	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.

	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.

	* test/socket/test_sockopt.rb (test_bool): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index eaaf0dff13..a9b379e148 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 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3