merge revision(s) 54231: [Backport #12121]

	* variable.c: Added documentation about order of `Module#constants`
	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]


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

3 files changed, 9 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 74a7c3832c..ce9a449a5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 29 01:02:49 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
+
 Tue Mar 29 00:56:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
 	* test/ruby/test_process.rb (test_execopts_gid): Skip a test
diff --git a/variable.c b/variable.c
index 1395f5d625..5b0b5d8e89 100644
--- a/variable.c
+++ b/variable.c
@@ -2074,6 +2074,9 @@ rb_const_list(void *data)
  *  modules (example at start of section), unless the <i>inherit</i>
  *  parameter is set to <code>false</code>.
  *
+ *  The implementation makes no guarantees about the order in which the
+ *  constants are yielded.
+ *
  *    IO.constants.include?(:SYNC)        #=> true
  *    IO.constants(false).include?(:SYNC) #=> false
  *
diff --git a/version.h b/version.h
index a218f3cc7f..a4f8e1b2f1 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 271
+#define RUBY_PATCHLEVEL 272
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3