[jboss-xnio] 02/04: Merge tag 'upstream/3.4.6'

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository jboss-xnio.

commit 88b86f7fb437614139ecb7cf89f33e5662dabd8e
Merge: 52b99da ff67ac8
Author: Markus Koschany <apo at debian.org>
Date:   Tue Jun 20 12:33:59 2017 +0200

    Merge tag 'upstream/3.4.6'
    
    Upstream version 3.4.6
    
    # gpg: Signatur vom Di 20 Jun 2017 12:33:58 CEST
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 api/pom.xml                                         |  2 +-
 .../main/java/org/xnio/ssl/JsseStreamConduit.java   | 21 +++++++++++++++++----
 .../java/org/xnio/streams/LimitedInputStream.java   |  2 +-
 nio-impl/pom.xml                                    |  2 +-
 .../main/java/org/xnio/nio/QueuedNioTcpServer.java  |  9 ++++-----
 .../src/main/java/org/xnio/nio/WorkerThread.java    |  4 ++++
 pom.xml                                             |  2 +-
 7 files changed, 29 insertions(+), 13 deletions(-)

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