From 4ef48a781ad8519f8dfe4871336d25a84e62bcd2 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Feb 2016 11:04:33 +0000 Subject: [PATCH] merge revision(s) 53790,53844: [Backport #12054] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lib/logger.rb: Remove block from Logger.add as it's not needed patch provided by Daniel Lobato Garcﾃｭ [fix GH-1240] [Bug #12054] patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/logger.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41f447e07a..05f08da760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 25 20:03:32 2016 Naotoshi Seo + + * 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 Feb 25 19:58:48 2016 Zachary Scott * re.c: Remove deprecated kcode argument from Regexp.new and compile diff --git a/lib/logger.rb b/lib/logger.rb index 3c50cb2313..9654450fd6 100644 --- a/lib/logger.rb +++ b/lib/logger.rb @@ -361,7 +361,7 @@ class Logger # * 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 diff --git a/version.h b/version.h index cede8bbbbf..f09a18e6d1 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 456 +#define RUBY_PATCHLEVEL 457 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2