Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2123dbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2123dbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2123dbb Branch: refs/heads/trunk Commit: b2123dbb762d22a73eeaf422f6576851234d9ad7 Parents: 36729b9 107a794 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Feb 12 14:04:28 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Feb 12 14:04:28 2015 +0000 ---------------------------------------------------------------------- .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 ++ src/java/org/apache/cassandra/io/compress/CompressionMetadata.java | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2123dbb/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2123dbb/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java ----------------------------------------------------------------------
