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

[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 c7b4ff3216091c63f583f07cd00b39efb5f1acb6
Merge: a177c40 8e7e532
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 29 22:45:18 2016 +0100

    Merge tag 'upstream/1.1.2.1'
    
    Upstream version 1.1.2.1

 src/main/java/org/xerial/snappy/Snappy.java | 23 ++++++++++++++++-------
 version.sbt                                 |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

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