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/3f8816f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f8816f9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f8816f9 Branch: refs/heads/trunk Commit: 3f8816f98f13ef1092c72c2f4ef94fc1dab3a76d Parents: e414868 6f4e0ba Author: Jonathan Ellis <[email protected]> Authored: Mon Feb 24 20:36:43 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Feb 24 20:36:43 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
