Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f110584 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f110584 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f110584 Branch: refs/heads/trunk Commit: 9f1105848317bad15f1960e710826f6c8b0ee142 Parents: 5787bb8 3136c20 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 22 13:46:26 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 22 13:46:26 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f110584/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
