usa	2016-03-25 18:42:52 +0900 (Fri, 25 Mar 2016)

  New Revision: 54285

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

  Log:
    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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/variable.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/variable.c
===================================================================
--- ruby_2_1/variable.c	(revision 54284)
+++ ruby_2_1/variable.c	(revision 54285)
@@ -2058,6 +2058,9 @@ rb_const_list(void *data) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/variable.c#L2058
  *  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
  *
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 54284)
+++ ruby_2_1/ChangeLog	(revision 54285)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Mar 25 18:42:46 2016  Koichi ITO  <koic.ito@g...>
+
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
+
 Fri Mar 25 18:41:14 2016  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (enc_succ_alnum_char): try to skip an invalid character
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 54284)
+++ ruby_2_1/version.h	(revision 54285)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 482
+#define RUBY_PATCHLEVEL 483
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54231


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