ruby-changes:41998
From: nagachika <ko1@a...>
Date: Thu, 10 Mar 2016 00:25:18 +0900 (JST)
Subject: [ruby-changes:41998] nagachika:r54072 (ruby_2_2): merge revision(s) 53790, 53844: [Backport #12054]
nagachika 2016-03-10 00:25:13 +0900 (Thu, 10 Mar 2016) New Revision: 54072 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54072 Log: merge revision(s) 53790,53844: [Backport #12054] * lib/logger.rb: Remove block from Logger.add as it's not needed patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054] Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/lib/logger.rb branches/ruby_2_2/version.h Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 54071) +++ ruby_2_2/version.h (revision 54072) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-10" -#define RUBY_PATCHLEVEL 255 +#define RUBY_PATCHLEVEL 256 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_2/lib/logger.rb =================================================================== --- ruby_2_2/lib/logger.rb (revision 54071) +++ ruby_2_2/lib/logger.rb (revision 54072) @@ -361,7 +361,7 @@ class Logger https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/logger.rb#L361 # * Append open does not need to lock file. # * If the OS supports multi I/O, records possibly may be mixed. # - def add(severity, message = nil, progname = nil, &block) + def add(severity, message = nil, progname = nil) severity ||= UNKNOWN if @logdev.nil? or severity < @level return true Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 54071) +++ ruby_2_2/ChangeLog (revision 54072) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Thu Mar 10 00:22:25 2016 Naotoshi Seo <sonots@g...> + + * lib/logger.rb: Remove block from Logger.add as it's not needed + patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054] + Thu Mar 10 00:17:57 2016 Zachary Scott <zzak@r...> * re.c: Remove deprecated kcode argument from Regexp.new and compile Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r53790,53844 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/