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
base: fcc8afc9e817
Choose a base ref
...
head repository: jruby/jruby
compare: ec5b7a375d64
Choose a head ref
  • 18 commits
  • 29 files changed
  • 4 contributors

Commits on Jan 28, 2015

  1. Copy the full SHA
    a88eb46 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2015

  1. Copy the full SHA
    028697a View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    4ddbaaa View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    3ab35b1 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    a939cef View commit details
    Browse the repository at this point in the history
  5. Reformat code properly.

    headius committed Jan 29, 2015
    Copy the full SHA
    0e20c3d View commit details
    Browse the repository at this point in the history
  6. Fix BC self-first-classloader tests.

    System properties are often loaded only once, as is the case for
    this value loaded into a static field of RubyInstanceConfig. This
    fix sets the mode in the container's config, removes the static
    field (just go directly to the Option), and provides get/set
    on ScriptingContainer.
    headius committed Jan 29, 2015
    Copy the full SHA
    9b4d8e9 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    d70d45e View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    ec4d2af View commit details
    Browse the repository at this point in the history
  9. MSpec: do not add a tag if there is already one with the same tag and…

    … description.
    
    * So adding comments do not provoke duplication of tags with `mspec tag`.
    * Reuse existing logic to read tags.
    eregon committed Jan 29, 2015
    Copy the full SHA
    86c8313 View commit details
    Browse the repository at this point in the history
  10. [Truffle] JT: use system since it works better on windows.

    * Improve message on failure.
    eregon committed Jan 29, 2015
    Copy the full SHA
    783c9b2 View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    6c5dfd6 View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    2c73464 View commit details
    Browse the repository at this point in the history
  13. [Truffle] Reorganize imports.

    eregon committed Jan 29, 2015
    Copy the full SHA
    42db50f View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    ac26614 View commit details
    Browse the repository at this point in the history
  15. Copy the full SHA
    b3bfc9d View commit details
    Browse the repository at this point in the history
  16. Copy the full SHA
    12ed071 View commit details
    Browse the repository at this point in the history
  17. Merge branch 'master' into truffle-head

    Conflicts:
    	truffle/src/main/java/org/jruby/truffle/runtime/core/RubyBasicObject.java
    chrisseaton committed Jan 29, 2015
    Copy the full SHA
    ec5b7a3 View commit details
    Browse the repository at this point in the history