[netty-3.9] 11/18: Merge tag 'upstream/3.9.4.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 4e9a7f21e983c18098006d47f60bfafe70d7838f
Merge: 130e276 a3116c9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:20:45 2017 +0100

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

 pom.xml                                            |   2 +-
 .../handler/codec/http/HttpContentCompressor.java  |  41 +-
 .../org/jboss/netty/handler/ipfilter/CIDR4.java    |   8 +
 .../org/jboss/netty/handler/ipfilter/CIDR6.java    |   8 +
 .../traffic/AbstractTrafficShapingHandler.java     | 288 +++++++---
 .../traffic/ChannelTrafficShapingHandler.java      |  75 ++-
 .../traffic/GlobalTrafficShapingHandler.java       | 102 +++-
 .../netty/handler/traffic/TrafficCounter.java      | 143 +++++
 .../netty/handler/ipfilter/IpFilterRuleTest.java   |  10 +-
 .../handler/traffic/TrafficShapingHandlerTest.java | 614 +++++++++++++++++++++
 10 files changed, 1193 insertions(+), 98 deletions(-)

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