nagachika	2014-03-22 00:34:57 +0900 (Sat, 22 Mar 2014)

  New Revision: 45379

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

  Log:
    merge revision(s) r45311: [Backport #9599]
    
    r45298 fix trivial bug
    
    $initial_size must be a size, not a status

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/envutil.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 45378)
+++ ruby_2_0_0/version.h	(revision 45379)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-03-20"
-#define RUBY_PATCHLEVEL 461
+#define RUBY_RELEASE_DATE "2014-03-22"
+#define RUBY_PATCHLEVEL 462
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/ruby/envutil.rb
===================================================================
--- ruby_2_0_0/test/ruby/envutil.rb	(revision 45378)
+++ ruby_2_0_0/test/ruby/envutil.rb	(revision 45379)
@@ -354,7 +354,8 @@ eom https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/envutil.rb#L354
         cmd = [
           'END {STDERR.puts '"#{token_dump}"'"FINAL=#{Memory::Status.new}"}',
           prepare,
-          'STDERR.puts('"#{token_dump}"'"START=#{$initial_size = Memory::Status.new}")',
+          'STDERR.puts('"#{token_dump}"'"START=#{$initial_status = Memory::Status.new}")',
+          '$initial_size = $initial_status.size',
           code,
           'GC.start',
         ].join("\n")

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45311


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