Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2971ff3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2971ff3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2971ff3b Branch: refs/heads/cassandra-3.5 Commit: 2971ff3b4330181518281e11e2b713390294fb72 Parents: b74ffea e01b3a9 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 8 10:41:32 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 8 10:41:32 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2971ff3b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java ----------------------------------------------------------------------