naruse	2014-02-01 17:35:30 +0900 (Sat, 01 Feb 2014)

  New Revision: 44788

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

  Log:
    merge revision(s) 44373: [Backport #9417]
    
    test_alias.rb: rename duplicate name
    
    * test/ruby/test_alias.rb (test_alias_wb_miss): rename duplicate
      name to get rid of redefinition.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/test/ruby/test_alias.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44787)
+++ ruby_2_1/version.h	(revision 44788)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
 #define RUBY_RELEASE_DATE "2014-02-01"
-#define RUBY_PATCHLEVEL 13
+#define RUBY_PATCHLEVEL 14
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_1/test/ruby/test_alias.rb
===================================================================
--- ruby_2_1/test/ruby/test_alias.rb	(revision 44787)
+++ ruby_2_1/test/ruby/test_alias.rb	(revision 44788)
@@ -121,7 +121,7 @@ class TestAlias < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_alias.rb#L121
     assert_equal([:Base, :M], SuperInAliasedModuleMethod::Derived.new.bar)
   end
 
-  def test_alias
+  def test_alias_wb_miss
     assert_normal_exit %q{
       require 'stringio'
       GC.verify_internal_consistency

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


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