archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 53790,53844: [Backport #12054]

Browse source 
* 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:
naruse 2016-03-29 05:57:39 +00:00
parent 14e5aab8b5
commit 14de088dcb
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Mar 29 14:52:20 2016 Zachary Scott <zzak@ruby-lang.org>
* re.c: Remove deprecated kcode argument from Regexp.new and compile * re.c: Remove deprecated kcode argument from Regexp.new and compile

2
lib/logger.rb
View file

@ -416,7 +416,7 @@ class Logger
# * Append open does not need to lock file. # * Append open does not need to lock file.
# * If the OS supports multi I/O, records possibly may be mixed. # * 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 severity ||= UNKNOWN
if @logdev.nil? or severity < @level if @logdev.nil? or severity < @level
return true return true

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.0" #define RUBY_VERSION "2.3.0"
#define RUBY_RELEASE_DATE "2016-03-29" #define RUBY_RELEASE_DATE "2016-03-29"
#define RUBY_PATCHLEVEL 19 #define RUBY_PATCHLEVEL 20
#define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3