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: e3719954b9d5
Choose a base ref
...
head repository: jruby/jruby
compare: 6fb60a4cad2b
Choose a head ref
  • 7 commits
  • 13 files changed
  • 2 contributors

Commits on Apr 23, 2015

  1. Use jnr-ffi 2.0.3 to gain ppc64le support. 

    jnr/jnr-ffi#40 and related issues.
    @headius
    headius committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    4752304 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. deprecation warning when using the old __jsend! internal method (no… 

    … longer in 9K)
    @kares
    kares committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    f7b8a8a View commit details
    Browse the repository at this point in the history

  2. Eliminate proxy leak by adding pre/post to unfinished proxy check.

    @headius
    headius committed Apr 24, 2015
    1 Configuration menu
    Copy the full SHA
    2bdfb5a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'test-proxy-leak' into jruby-1_7

    @headius
    headius committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    f7d09d0 View commit details
    Browse the repository at this point in the history

  4. Use jnr-ffi 2.0.3 to gain ppc64le support. 

    jnr/jnr-ffi#40 and related issues.
    @headius
    headius committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    c815260 View commit details
    Browse the repository at this point in the history

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

    Conflicts:
	core/src/main/java/org/jruby/javasupport/JavaSupport.java
	core/src/main/java/org/jruby/javasupport/binding/Initializer.java
	core/src/main/java/org/jruby/javasupport/binding/InterfaceInitializer.java
    @headius
    headius committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    a1cb409 View commit details
    Browse the repository at this point in the history

  6. Revert "remove more jruby.home properties from build" 

    This reverts commit 46f43bb.
    @headius
    headius committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    6fb60a4 View commit details
    Browse the repository at this point in the history