nagachika	2016-08-21 14:52:25 +0900 (Sun, 21 Aug 2016)

  New Revision: 55979

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=55979

  Log:
    merge revision(s) 53433: [Backport #12668]
    
    test_ostruct.rb: sort method names
    
    * test/ostruct/test_ostruct.rb (test_accessor_defines_method):
      should not depend on the order of methods.

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/test/ostruct/test_ostruct.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/test/ostruct/test_ostruct.rb
===================================================================
--- ruby_2_3/test/ostruct/test_ostruct.rb	(revision 55978)
+++ ruby_2_3/test/ostruct/test_ostruct.rb	(revision 55979)
@@ -170,7 +170,7 @@ class TC_OpenStruct < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ostruct/test_ostruct.rb#L170
     assert os.respond_to? :foo
     assert_equal([], os.singleton_methods)
     assert_equal(42, os.foo)
-    assert_equal([:foo, :foo=], os.singleton_methods)
+    assert_equal([:foo, :foo=], os.singleton_methods.sort)
   end
 
   def test_does_not_redefine
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55978)
+++ ruby_2_3/version.h	(revision 55979)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-08-18"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_RELEASE_DATE "2016-08-21"
+#define RUBY_PATCHLEVEL 174
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53433


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/