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: 13629b86ce8b
Choose a base ref
...
head repository: jruby/jruby
compare: 302cc9c31c94
Choose a head ref
  • 7 commits
  • 74 files changed
  • 2 contributors

Commits on Nov 29, 2014

  1. make JRubyClassLoader binary compatible to jruby-1.7.x again 

    and still keep the extra features restricted to runtime.getJRubyClassLoaders.
all other internal CL will be ClassDefiningJRubyClassLoader.
    @mkristian
    mkristian committed Nov 29, 2014
    1
    Copy the full SHA
    b45a7f0 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2014

  1. [Truffle] Remove RubyObject class - use RubyBasicObject instead in mo… 

    …st instances.
    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    28403ca View commit details
    Browse the repository at this point in the history

  2. [Truffle] Work on #object_id.

    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    c8d0995 View commit details
    Browse the repository at this point in the history

  3. [Truffle] Wrap BigInteger up into RubyBignum - we need a place to put… 

    … the ID.
    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    d7cf496 View commit details
    Browse the repository at this point in the history

  4. [Truffle] Fix Bignum#divmod bug.

    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    8bdf8e2 View commit details
    Browse the repository at this point in the history

  5. Merge commit master into truffle-head

    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    6a3d976 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into truffle-head 

    Conflicts:
	core/src/main/java/org/jruby/truffle/nodes/control/WrapperNode.java
	core/src/main/java/org/jruby/truffle/nodes/core/BignumNodes.java
	core/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
	core/src/main/java/org/jruby/truffle/nodes/core/FixnumOrBignumNode.java
	core/src/main/java/org/jruby/truffle/nodes/core/FloatNodes.java
	core/src/main/java/org/jruby/truffle/nodes/core/GeneralDivModNode.java
	core/src/main/java/org/jruby/truffle/nodes/core/MathNodes.java
	core/src/main/java/org/jruby/truffle/nodes/debug/RubyWrapper.java
	core/src/main/java/org/jruby/truffle/runtime/util/RuntimeBigInteger.java
    @chrisseaton
    chrisseaton committed Nov 30, 2014
    Copy the full SHA
    302cc9c View commit details
    Browse the repository at this point in the history