Updated Branches: refs/heads/cassandra-1.2 2d3ee8000 -> 31ba28909 refs/heads/trunk f7359466a -> 5363189f9
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5363189f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5363189f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5363189f Branch: refs/heads/trunk Commit: 5363189f9e75c2bc26571448c1b4fb278e297774 Parents: f735946 31ba289 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 11 13:00:08 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 11 13:00:08 2012 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5363189f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
