merge revision(s) 49225: [Backport #10711]

	* test/ruby/test_numeric.rb (TestNumeric#test_coerce): fixed wrong message.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/test/ruby/test_numeric.rb b/test/ruby/test_numeric.rb
index 9c5d762602..4c94c69651 100644
--- a/test/ruby/test_numeric.rb
+++ b/test/ruby/test_numeric.rb
@@ -34,7 +34,7 @@ class TestNumeric < Test::Unit::TestCase
     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
 
diff --git a/version.h b/version.h
index 7646b5d808..a85aff4fe5 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #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