ruby-changes:28622
From: nagachika <ko1@a...>
Date: Sun, 12 May 2013 21:29:53 +0900 (JST)
Subject: [ruby-changes:28622] nagachika:r40674 (ruby_2_0_0): merge revision(s) 40652:
nagachika 2013-05-12 21:29:44 +0900 (Sun, 12 May 2013) New Revision: 40674 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40674 Log: merge revision(s) 40652: fix a typo Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/test/rake/test_rake_thread_pool.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 40673) +++ ruby_2_0_0/version.h (revision 40674) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-05-12" -#define RUBY_PATCHLEVEL 191 +#define RUBY_PATCHLEVEL 192 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 5 Index: ruby_2_0_0/test/rake/test_rake_thread_pool.rb =================================================================== --- ruby_2_0_0/test/rake/test_rake_thread_pool.rb (revision 40673) +++ ruby_2_0_0/test/rake/test_rake_thread_pool.rb (revision 40674) @@ -46,7 +46,7 @@ class TestRakeTestThreadPool < Rake::Tes https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/rake/test_rake_thread_pool.rb#L46 pool = ThreadPool.new(2) a = 'a' b = 'b' - c = 5 # 5 throws an execption with 5.dup. It should be ignored + c = 5 # 5 throws an exception with 5.dup. It should be ignored pool.future(a,c){ |a_var,ignore| a_var.capitalize!; b.capitalize! } pool.join assert_equal 'a', a Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40652 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/