[netty-3.9] 12/18: Merge tag 'upstream/3.9.5.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 309fc86d6032deea0d20597a2f6546e861a0fc42
Merge: 4e9a7f2 c1d8fe0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:23:47 2017 +0100

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

 pom.xml                                            | 19 ++------
 .../channel/socket/nio/AbstractNioSelector.java    | 33 ++++++++++---
 .../handler/codec/http/HttpContentEncoder.java     |  4 +-
 .../multipart/HttpPostMultipartRequestDecoder.java | 10 ++--
 .../http/multipart/HttpPostRequestDecoder.java     | 18 +++----
 .../traffic/AbstractTrafficShapingHandler.java     |  2 +-
 .../traffic/GlobalTrafficShapingHandler.java       |  1 +
 .../netty/handler/traffic/TrafficCounter.java      |  4 +-
 .../org/jboss/netty/util/internal/StringUtil.java  | 57 ++++++++++++++++++++++
 .../handler/codec/http/HttpContentEncoderTest.java | 39 +++++++++++++++
 .../jboss/netty/util/internal/StringUtilTest.java  | 11 +++++
 11 files changed, 159 insertions(+), 39 deletions(-)

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