Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee4cb86e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee4cb86e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee4cb86e Branch: refs/heads/trunk Commit: ee4cb86ec4ca97f51a614dfeb434aa365695ef5c Parents: 6ae27a3 29687a8 Author: Benedict Elliott Smith <[email protected]> Authored: Mon Aug 17 09:26:53 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Aug 17 09:26:53 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/ColumnIndex.java | 10 +- .../io/compress/CompressedSequentialWriter.java | 33 +++- .../io/sstable/format/big/BigTableWriter.java | 6 +- .../io/util/BufferedDataOutputStreamPlus.java | 104 ++++++---- .../io/util/ChecksummedSequentialWriter.java | 3 +- .../cassandra/io/util/SequentialWriter.java | 196 +++++-------------- .../org/apache/cassandra/utils/SyncUtil.java | 22 ++- .../compaction/CompactionAwareWriterTest.java | 9 +- .../CompressedSequentialWriterTest.java | 2 +- .../io/util/BufferedDataOutputStreamTest.java | 62 +++++- .../io/util/BufferedRandomAccessFileTest.java | 6 +- .../compression/CompressedInputStreamTest.java | 2 +- 13 files changed, 240 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee4cb86e/CHANGES.txt ----------------------------------------------------------------------
