mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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 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_3@54362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
14e5aab8b5
commit
14de088dcb
3 changed files with 7 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Mar 29 14:53:58 2016 Naotoshi Seo <sonots@gmail.com>
|
||||
|
||||
* lib/logger.rb: Remove block from Logger.add as it's not needed
|
||||
patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
|
||||
|
||||
Tue Mar 29 14:52:20 2016 Zachary Scott <zzak@ruby-lang.org>
|
||||
|
||||
* re.c: Remove deprecated kcode argument from Regexp.new and compile
|
||||
|
|
|
@ -416,7 +416,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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#define RUBY_VERSION "2.3.0"
|
||||
#define RUBY_RELEASE_DATE "2016-03-29"
|
||||
#define RUBY_PATCHLEVEL 19
|
||||
#define RUBY_PATCHLEVEL 20
|
||||
|
||||
#define RUBY_RELEASE_YEAR 2016
|
||||
#define RUBY_RELEASE_MONTH 3
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue