Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f7746d0be94f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6ce5e55765ec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 14, 2016

  1. Fix JRuby issue#4147

    When check the OS platform, the RUBY_PLATFORM return 'java' in JRuby.
    smk0621 authored Sep 14, 2016
    Copy the full SHA
    2f9ec95 View commit details
  2. Merge pull request #4153 from smk0621/master

    Fix for #4147
    kares authored Sep 14, 2016
    Copy the full SHA
    6ce5e55 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/ruby/stdlib/logger.rb
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/logger.rb
Original file line number Diff line number Diff line change
@@ -742,7 +742,7 @@ def check_shift_log
end
end

if /mswin|mingw/ =~ RUBY_PLATFORM
if /mswin|mingw/ =~ RbConfig::CONFIG['host_os']
def lock_shift_log
yield
end