naruse	2015-01-18 17:17:20 +0900 (Sun, 18 Jan 2015)

  New Revision: 49323

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

  Log:
    merge revision(s) 49225: [Backport #10711]
    
    * test/ruby/test_numeric.rb (TestNumeric#test_coerce): fixed wrong message.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/ruby/test_numeric.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49322)
+++ ruby_2_2/version.h	(revision 49323)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.0"
 #define RUBY_RELEASE_DATE "2015-01-18"
-#define RUBY_PATCHLEVEL 26
+#define RUBY_PATCHLEVEL 27
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_2/test/ruby/test_numeric.rb
===================================================================
--- ruby_2_2/test/ruby/test_numeric.rb	(revision 49322)
+++ ruby_2_2/test/ruby/test_numeric.rb	(revision 49323)
@@ -34,7 +34,7 @@ class TestNumeric < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_numeric.rb#L34
     end
 
     bug10711 = '[ruby-core:67405] [Bug #10711]'
-    exp = "Float can't be coerced into Fixnum"
+    exp = "1.2 can't be coerced into Fixnum"
     assert_raise_with_message(TypeError, exp, bug10711) { 1 & 1.2 }
   end
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49225


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