Updated Branches: refs/heads/cassandra-1.1 45af95ab3 -> b4af12b43 refs/heads/trunk 1ba6dc1b0 -> 1d850e1a5
Merge branch 'cassandra-1.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/1d850e1a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d850e1a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d850e1a Branch: refs/heads/trunk Commit: 1d850e1a5647697d58c1c37a607d4b3809ca7f9a Parents: 1ba6dc1 b4af12b Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Mar 26 23:34:28 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Mar 26 23:34:28 2012 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d850e1a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
