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: 59bfc0b77a38
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9444cd372192
Choose a head ref
  • 20 commits
  • 23 files changed
  • 4 contributors

Commits on Sep 3, 2015

  1. [Truffle] jruby+truffle_runner: change default bundle path to .jruby+… 

    …truffle_bundle
    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    e8610d7 View commit details

  2. [Truffle] jruby+truffle_runner: use flat_map

    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    b2d8260 View commit details

  3. [Truffle] jruby+truffle_runner: do not polute stdout

    @pitr-ch
    pitr-ch committed Sep 3, 2015
    Copy the full SHA
    69231c8 View commit details

  4. [Truffle] jruby+truffle_runner: add default configuration for concurr… 

    …ent-ruby
    @pitr-ch
    pitr-ch committed Sep 3, 2015
    4
    Copy the full SHA
    7a99f1c View commit details

  5. [Truffle] Actually raise the error.

    @eregon
    eregon committed Sep 3, 2015
    Copy the full SHA
    e4218fa View commit details

  6. [Truffle] Removed the unused rubyWithSelf().

    @eregon
    eregon committed Sep 3, 2015
    Copy the full SHA
    67900d0 View commit details

  7. Do not process arguments twice. Fixes #3294.

    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    9e2d6dc View commit details

  8. Merge remote-tracking branch 'origin/jruby-1_7'

    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    1cbb8d6 View commit details

  9. Reapply fix from #1198 to fix #3292. Unsure how to test this.

    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    aae72b5 View commit details

  10. Mark File.readlink as not impl on Windows. Sorta fixes #3287. 

    MRI does not appear to implement any Windows version of
File.readlink, and instead just marks it as not impleemnted when
it is not available at compile time. We will do the same, but I do
wonder if both of us could provide equivalent functionality using
Win32 soft/hard link API calls.
    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    2797b9b View commit details

  11. Merge remote-tracking branch 'origin/jruby-1_7'

    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    70c6156 View commit details

  12. Update to jnr-ffi-2.0.4-SNAPSHOT for #3285. 

    See also jnr/jnr-ffi#50.
    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    34c2316 View commit details

  13. Handle socket errors with appropriate unwrapping. Fixes #3282.

    @headius
    headius committed Sep 3, 2015
    Copy the full SHA
    60be4d2 View commit details

Commits on Sep 5, 2015

  1. [Truffle] Big tree experiment.

    @chrisseaton
    chrisseaton committed Sep 5, 2015
    Copy the full SHA
    364ca97 View commit details

Commits on Sep 6, 2015

  1. [Truffle] Modify total-allocation to use KB.

    @chrisseaton
    chrisseaton committed Sep 6, 2015
    Copy the full SHA
    fe19bb5 View commit details

Commits on Sep 7, 2015

  1. [Truffle] Reintroduce version check, it is at least useful for 0.8. 

    * Fixes #3311.
    @eregon
    eregon committed Sep 7, 2015
    Copy the full SHA
    04cf44a View commit details

  2. [Truffle] Use the posix() helper.

    @chrisseaton
    chrisseaton committed Sep 7, 2015
    Copy the full SHA
    6bae7a6 View commit details

  3. [Truffle] add RubyFiletypeDetector

    @pitr-ch
    pitr-ch committed Sep 7, 2015
    Copy the full SHA
    410350c View commit details

  4. Merge branch 'master' into truffle-head

    @chrisseaton
    chrisseaton committed Sep 7, 2015
    Copy the full SHA
    1b2553b View commit details

  5. [Truffle] Update for new API.

    @chrisseaton
    chrisseaton committed Sep 7, 2015
    Copy the full SHA
    9444cd3 View commit details
Loading