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/4b16c111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b16c111 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b16c111 Branch: refs/heads/trunk Commit: 4b16c11169ab8c854d2ffdb3e8f2900ac8fee979 Parents: e887336 9d421f3 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Feb 19 11:59:58 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Feb 19 11:59:58 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../io/sstable/SSTableSimpleUnsortedWriter.java | 21 ++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b16c111/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b16c111/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java ----------------------------------------------------------------------
