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/35e5721f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/35e5721f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/35e5721f Branch: refs/heads/trunk Commit: 35e5721f8139a68aa5bba185c862395290f242e0 Parents: 800c62f 872eef3 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 6 10:15:28 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 6 10:15:28 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 10 ++++++++-- .../apache/cassandra/io/sstable/CQLSSTableWriterTest.java | 9 ++++++++- 3 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/35e5721f/CHANGES.txt ----------------------------------------------------------------------
