nagachika	2015-12-12 17:25:24 +0900 (Sat, 12 Dec 2015)

  New Revision: 53051

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

  Log:
    merge revision(s) 53050: [Backport #11501]
    
    * doc/NEWS-0.2.2: add description about incompatible change in Hash
      duplicated key overriding policy. [Bug #10315] [Bug #11501]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/NEWS
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 53050)
+++ ruby_2_2/ChangeLog	(revision 53051)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sat Dec 12 17:19:27 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* doc/NEWS-0.2.2: add description about incompatible change in Hash
+	  duplicated key overriding policy. [Bug #10315] [Bug #11501]
+
 Fri Dec 11 22:41:15 2015  Eric Wong  <e@8...>
 
 	* insns.def (opt_case_dispatch): avoid converting Infinity
Index: ruby_2_2/NEWS
===================================================================
--- ruby_2_2/NEWS	(revision 53050)
+++ ruby_2_2/NEWS	(revision 53051)
@@ -105,6 +105,11 @@ with all sufficient information, see the https://github.com/ruby/ruby/blob/trunk/ruby_2_2/NEWS#L105
     * Rename GC.stat entries. [Feature #9924]
       See https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
 
+* Hash
+  * incompatible changes:
+    * Change overriding policy for duplicated key. [Bug #10315]
+      { **hash1, **hash2 } contains values of hash2 for duplicated keys.
+
 * IO
   * incompatible changes:
     * When flushing file IO with IO#flush, you cannot assume that the metadata
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 53050)
+++ ruby_2_2/version.h	(revision 53051)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-12-11"
-#define RUBY_PATCHLEVEL 227
+#define RUBY_RELEASE_DATE "2015-12-12"
+#define RUBY_PATCHLEVEL 228
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53050


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