[snappy-java] 01/03: Merge tag 'upstream/1.1.2'

[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 80ba81a0bf0820bb48e0f83072aad42be5ee6b69
Merge: c9838c4 488e745
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 5 09:35:55 2015 +0200

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2

 Makefile                                           |    2 +-
 Makefile.common                                    |   37 +-
 Milestone.md                                       |   16 +-
 README.md                                          |   28 +-
 build.sbt                                          |   49 +-
 project/build.properties                           |    2 +-
 project/plugins.sbt                                |   10 +-
 sbt                                                |  376 +++--
 src/checkstyle/checks.xml                          |  117 ++
 src/main/java/org/xerial/snappy/OSInfo.java        |   63 +-
 .../java/org/xerial/snappy/PureJavaCrc32C.java     | 1240 +++++++-------
 src/main/java/org/xerial/snappy/Snappy.java        | 1732 ++++++++++----------
 .../org/xerial/snappy/SnappyBundleActivator.java   |  133 +-
 src/main/java/org/xerial/snappy/SnappyCodec.java   |  251 +--
 src/main/java/org/xerial/snappy/SnappyError.java   |  127 +-
 .../java/org/xerial/snappy/SnappyErrorCode.java    |  131 +-
 .../java/org/xerial/snappy/SnappyException.java    |  156 +-
 src/main/java/org/xerial/snappy/SnappyFramed.java  |  373 ++---
 .../org/xerial/snappy/SnappyFramedInputStream.java |  144 +-
 .../xerial/snappy/SnappyFramedOutputStream.java    |  178 +-
 .../java/org/xerial/snappy/SnappyIOException.java  |   11 +-
 .../java/org/xerial/snappy/SnappyInputStream.java  |  274 ++--
 src/main/java/org/xerial/snappy/SnappyLoader.java  |  193 ++-
 src/main/java/org/xerial/snappy/SnappyNative.cpp   |  618 +++----
 src/main/java/org/xerial/snappy/SnappyNative.java  |  187 ++-
 .../java/org/xerial/snappy/SnappyOutputStream.java |  145 +-
 src/main/java/org/xerial/snappy/VERSION            |    2 -
 .../org/xerial/snappy/buffer/BufferAllocator.java  |    5 +-
 .../snappy/buffer/BufferAllocatorFactory.java      |    3 +-
 .../snappy/buffer/CachedBufferAllocator.java       |   43 +-
 .../snappy/buffer/DefaultBufferAllocator.java      |   18 +-
 src/main/java/org/xerial/snappy/package-info.java  |   88 +-
 src/main/resources/org/xerial/snappy/VERSION       |    1 +
 src/test/java/org/xerial/snappy/CalgaryTest.java   |  466 +++---
 src/test/java/org/xerial/snappy/OSInfoTest.java    |   23 +-
 .../java/org/xerial/snappy/RandomGenerator.java    |  139 +-
 .../org/xerial/snappy/SnappyFramedStreamTest.java  |  152 +-
 .../org/xerial/snappy/SnappyInputStreamTest.java   |  352 ++--
 .../java/org/xerial/snappy/SnappyLoaderTest.java   |  262 +--
 .../org/xerial/snappy/SnappyOutputStreamTest.java  |  163 +-
 src/test/java/org/xerial/snappy/SnappyTest.java    |  636 +++----
 version.sbt                                        |    3 +-
 42 files changed, 4944 insertions(+), 4005 deletions(-)

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