[jruby] 05/06: Merge tag 'upstream/1.7.26'

[Miguel Landaeta]

This is an automated email from the git hooks/post-receive script.

nomadium pushed a commit to branch master
in repository jruby.

commit cf44a52f6f3828cc078bb476b9889ac66c45e088
Merge: a641bbb 2ed5cac
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Nov 12 20:29:04 2016 +0000

    Merge tag 'upstream/1.7.26'
    
    Upstream release 1.7.26
    
    # gpg: Signature made Sat 12 Nov 2016 08:26:01 PM IST using RSA key AFB8E0FC9231CC6D
    # gpg: Good signature from "Miguel Landaeta <miguel at miguel.cc>"
    # gpg:                 aka "Miguel Landaeta <nomadium at gmail.com>"
    # gpg:                 aka "Miguel Landaeta (LDC) <miguel at ldc.usb.ve>"
    # gpg:                 aka "Miguel Landaeta (Debian) <nomadium at debian.org>"

 .travis.yml                                        | 14 ++++-
 VERSION                                            |  2 +-
 appveyor.yml                                       |  6 +-
 core/pom.xml                                       |  9 +--
 core/src/main/java/org/jruby/JarBootstrapMain.java |  2 +-
 core/src/main/java/org/jruby/Main.java             |  2 +-
 core/src/main/java/org/jruby/Ruby.java             | 29 ++++-----
 core/src/main/java/org/jruby/RubyClass.java        | 35 ++++++-----
 .../main/java/org/jruby/RubyClassPathVariable.java | 14 +++--
 core/src/main/java/org/jruby/RubyGC.java           |  8 +--
 .../main/java/org/jruby/RubyInstanceConfig.java    |  2 +-
 core/src/main/java/org/jruby/RubyKernel.java       |  4 +-
 core/src/main/java/org/jruby/RubyMath.java         | 11 +++-
 core/src/main/java/org/jruby/RubyRange.java        |  9 +--
 core/src/main/java/org/jruby/RubyString.java       |  4 +-
 .../org/jruby/ext/bigdecimal/RubyBigDecimal.java   | 30 ++-------
 core/src/main/java/org/jruby/ext/etc/RubyEtc.java  |  9 ++-
 .../java/org/jruby/ext/socket/RubyUDPSocket.java   |  4 ++
 .../org/jruby/java/invokers/RubyToJavaInvoker.java | 15 ++++-
 .../jruby/util/CompoundJarURLStreamHandler.java    |  8 +--
 .../main/java/org/jruby/util/JRubyClassLoader.java |  2 +
 core/src/main/java/org/jruby/util/JRubyFile.java   |  3 +-
 .../java/org/jruby/util/cli/OutputStrings.java     |  2 +-
 .../java/org/jruby/util/io/ChannelDescriptor.java  | 11 ++++
 .../main/java/org/jruby/util/io/ChannelStream.java |  1 +
 .../org/jruby/test/TestRubyInstanceConfig.java     | 71 +++++++++++++++++++++-
 core/src/test/resources/test_dir/test_script.rb    |  1 +
 docs/man/pom.xml                                   |  2 +-
 docs/pom.xml                                       |  2 +-
 ext/pom.xml                                        |  4 +-
 ext/readline/pom.xml                               |  2 +-
 ext/ripper/pom.xml                                 |  4 +-
 .../java/org/jruby/ext/ripper/RipperLexer.java     |  8 +--
 lib/pom.xml                                        |  4 +-
 lib/ruby/1.9/digest.rb                             | 64 ++++++++++++-------
 lib/ruby/1.9/net/http.rb                           |  4 +-
 maven/jruby-complete/pom.xml                       |  2 +-
 maven/jruby-dist/pom.xml                           |  2 +-
 maven/jruby-jars/pom.xml                           |  6 +-
 maven/jruby-noasm/pom.xml                          |  2 +-
 maven/jruby-rake-plugin/pom.xml                    |  2 +-
 maven/jruby-stdlib/pom.xml                         |  2 +-
 maven/jruby/pom.xml                                |  2 +-
 maven/pom.xml                                      |  2 +-
 pom.xml                                            |  4 +-
 test/externals/ruby1.9/excludes/TestOpen3.rb       |  1 +
 test/pom.xml                                       |  2 +-
 47 files changed, 277 insertions(+), 152 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jruby.git