usa	2012-02-14 16:36:03 +0900 (Tue, 14 Feb 2012)

  New Revision: 34594

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

  Log:
    merge revision(s) 33232:
    
    * test/rubygems/test_gem_commands_help_command.rb: Add one
      `require` because if run test-all with test/unit parallel
      running, sometimes this test fails by some constants not found.
      The error reason is some worker doesn't require the file needed by
      this test. This issue is related to [ruby-core:36168].

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/rubygems/test_gem_commands_help_command.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34593)
+++ ruby_1_9_3/ChangeLog	(revision 34594)
@@ -1,10 +1,18 @@
-Tue Feb 14 15:58:31 2012  NAKAMURA Usaku  <usa@r...>
+Tue Feb 14 16:34:11 2012  Shota Fukumori  <sorah@t...>
 
+	* test/rubygems/test_gem_commands_help_command.rb: Add one
+	  `require` because if run test-all with test/unit parallel
+	  running, sometimes this test fails by some constants not found.
+	  The error reason is some worker doesn't require the file needed by
+	  this test. This issue is related to [ruby-core:36168].
+
+Tue Feb 14 15:58:31 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (initial_params): pack in a struct.
+
 	* gc.c (rb_gc_set_params): set parameters always.
 	  [ruby-dev:44648] [Bug #5467]
 
-	* gc.c (initial_params): pack in a struct.
-
 Tue Feb 14 15:44:42 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/irb/test_completion.rb: skip if cannot load irb/completion
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34593)
+++ ruby_1_9_3/version.h	(revision 34594)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 107
+#define RUBY_PATCHLEVEL 108
 
 #define RUBY_RELEASE_DATE "2012-02-14"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/rubygems/test_gem_commands_help_command.rb
===================================================================
--- ruby_1_9_3/test/rubygems/test_gem_commands_help_command.rb	(revision 34593)
+++ ruby_1_9_3/test/rubygems/test_gem_commands_help_command.rb	(revision 34594)
@@ -3,6 +3,7 @@
 require "rubygems/commands/help_command"
 require "rubygems/format"
 require "rubygems/command_manager"
+require_relative "rubygems_plugin"
 
 class TestGemCommandsHelpCommand < Gem::TestCase
   def setup

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