[snappy-java] 01/02: Merge tag 'upstream/1.1.2.4'

[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 09f4d642d2837be48580c5e51b5e2f9b6a967585
Merge: 02e4825 d71d0e1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 5 16:03:40 2016 +0200

    Merge tag 'upstream/1.1.2.4'
    
    Upstream version 1.1.2.4

 project/build.properties                            |  2 +-
 project/plugins.sbt                                 |  4 ++--
 .../java/org/xerial/snappy/SnappyInputStream.java   | 21 +++++++++++++++++++--
 .../java/org/xerial/snappy/SnappyOutputStream.java  | 21 +++++++++++++++++++--
 version.sbt                                         |  2 +-
 5 files changed, 42 insertions(+), 8 deletions(-)

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