Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f4e0ba6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f4e0ba6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f4e0ba6 Branch: refs/heads/trunk Commit: 6f4e0ba6b028ef9cc453c74804bd14d558d1e0d0 Parents: f0c9bd1 3bfb764 Author: Jonathan Ellis <[email protected]> Authored: Mon Feb 24 20:36:35 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Feb 24 20:36:35 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f4e0ba6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
