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/3fededce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fededce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fededce Branch: refs/heads/trunk Commit: 3fededce1bbfc4fff320c058bcf0a97ca6124a20 Parents: 56e190b 0e62131 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Mar 5 20:05:25 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Mar 5 20:05:25 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/compress/CompressedSequentialWriter.java | 2 +- .../io/util/ChecksummedSequentialWriter.java | 2 +- .../io/util/DataIntegrityMetadata.java | 22 ++++++++++++++++++-- 4 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fededce/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fededce/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fededce/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java ----------------------------------------------------------------------
