[netty-3.9] 13/18: Merge tag 'upstream/3.9.6.Final'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository netty-3.9.

commit 8a5f085affe409bf54f386c939b9aa172ac1f0c0
Merge: 309fc86 106e51a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:24:28 2017 +0100

    Merge tag 'upstream/3.9.6.Final'
    
    Upstream version 3.9.6.Final

 .travis.yml                                        |  12 -
 pom.xml                                            |  17 +-
 .../channel/socket/nio/AbstractNioBossPool.java    |   6 +-
 .../channel/socket/nio/AbstractNioWorkerPool.java  |   7 +-
 .../handler/codec/compression/JdkZlibEncoder.java  |  86 ++-
 .../handler/codec/compression/ZlibEncoder.java     |  26 +-
 .../netty/handler/codec/compression/ZlibUtil.java  |  19 +
 .../codec/http/multipart/AbstractDiskHttpData.java |   4 +-
 .../netty/handler/codec/spdy/SpdyHttpDecoder.java  |  72 +-
 .../org/jboss/netty/handler/ssl/JdkSslContext.java |  18 +-
 .../netty/handler/ssl/OpenSslServerContext.java    |   7 +-
 src/main/java/org/jboss/netty/util/NetUtil.java    | 730 ++++++++++++++++-----
 .../netty/handler/codec/compression/JZlibTest.java |  25 +
 .../handler/codec/compression/JdkZlibTest.java     |  25 +
 .../netty/handler/codec/compression/ZlibTest.java  | 328 +++++++++
 .../java/org/jboss/netty/util/NetUtilTest.java     | 603 +++++++++++------
 16 files changed, 1539 insertions(+), 446 deletions(-)

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