[snappy-java] 02/03: Merge tag 'upstream/1.1.2.6'

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository snappy-java.

commit 81b2efe2c4fce8aaa9b84974548af0c21006d563
Merge: 982c544 b3393aa
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 8 14:08:08 2016 +0200

    Merge tag 'upstream/1.1.2.6'
    
    Upstream version 1.1.2.6

 src/main/java/org/xerial/snappy/SnappyCodec.java   | 12 ++++++++
 .../java/org/xerial/snappy/SnappyInputStream.java  |  2 +-
 .../org/xerial/snappy/SnappyInputStreamTest.java   | 33 ++++++++++++++++++++++
 version.sbt                                        |  2 +-
 4 files changed, 47 insertions(+), 2 deletions(-)

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