Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a36436fc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a36436fc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a36436fc Branch: refs/heads/trunk Commit: a36436fc3f3c9f71307427ec344ba2474e47a1a2 Parents: 359d566 00f6173 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Sep 30 13:01:30 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Sep 30 13:01:30 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a36436fc/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
