[netty-3.9] 17/18: Merge tag 'upstream/3.9.9.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 55d379426fa84ecb9ea4d09d5295e538c5795fa3
Merge: 3783210 4fb04bc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 01:30:49 2017 +0100

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

 pom.xml                                              |  2 +-
 .../codec/http/cookie/ServerCookieEncoder.java       |  2 +-
 .../handler/codec/http/multipart/DiskFileUpload.java |  2 +-
 .../codec/http/multipart/HttpPostRequestEncoder.java |  4 ++--
 .../codec/http/multipart/MemoryFileUpload.java       |  2 +-
 .../netty/handler/ssl/OpenSslServerContext.java      |  2 +-
 .../codec/http/cookie/ServerCookieEncoderTest.java   | 20 ++++++++++++++++++++
 7 files changed, 27 insertions(+), 7 deletions(-)

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