Merge branch 'cassandra-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/dad8d80f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dad8d80f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dad8d80f Branch: refs/heads/cassandra-1.1 Commit: dad8d80fe5b48c56215dcc596866f8610909dfa8 Parents: 64a5e70 043d180 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sat May 26 00:23:17 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sat May 26 00:23:17 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dad8d80f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
