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: 66f45f7f8c72
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3796de242437
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 13, 2015

  1. [Truffle] Add timeout library stud to satisfy MRI test require.

    @bjfish
    bjfish committed Apr 13, 2015
    Copy the full SHA
    f34b719 View commit details

Commits on Apr 14, 2015

  1. Merge pull request #2832 from bjfish/truffle_timeout_shim 

    [Truffle] timeout stub
    @chrisseaton
    chrisseaton committed Apr 14, 2015
    Copy the full SHA
    3796de2 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 lib/ruby/truffle/mri/timeout.rb
1 change: 1 addition & 0 deletions lib/ruby/truffle/mri/timeout.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Stub to satisfy `require "timeout"` for MRI tests