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/cc0247b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc0247b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc0247b1 Branch: refs/heads/trunk Commit: cc0247b1252bf83cbd14057f60fcf18fc10cfacc Parents: 04389ad 6ee4b09 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 30 11:00:40 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 30 11:00:40 2015 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc0247b1/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ----------------------------------------------------------------------
