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]


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

3 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5bbfe00b97..9e19275c6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec 12 17:19:27 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* 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@80x24.org>
 
 	* insns.def (opt_case_dispatch): avoid converting Infinity
diff --git a/NEWS b/NEWS
index b909208924..5ac07db507 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,11 @@ with all sufficient information, see the ChangeLog file.
     * 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
diff --git a/version.h b/version.h
index 3d396d00e3..c01e28eb2c 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"