[jboss-xnio] 01/02: Merge tag 'upstream/3.3.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 84ba8c16360d6deefa4d7268fc670d4eb672e3d0
Merge: 92a4e4b 797e0a7
Author: Markus Koschany <apo at debian.org>
Date:   Sat Apr 9 23:30:38 2016 +0200

    Merge tag 'upstream/3.3.6'
    
    Upstream version 3.3.6
    
    # gpg: Signature made Sat 09 Apr 2016 23:30:34 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 api/pom.xml                                              |  2 +-
 nio-impl/pom.xml                                         |  2 +-
 .../src/main/java/org/xnio/nio/NioSocketConduit.java     | 16 ++++++++++++----
 .../src/main/java/org/xnio/nio/QueuedNioTcpServer.java   |  4 ----
 pom.xml                                                  | 10 ++++++----
 5 files changed, 20 insertions(+), 14 deletions(-)

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