Updated Branches: refs/heads/cassandra-1.2 1fac06a84 -> fc0f2472d refs/heads/trunk 351bc03c6 -> 009a446b3
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/009a446b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/009a446b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/009a446b Branch: refs/heads/trunk Commit: 009a446b3e2a422d3692e8ca538b1dbc515df5e3 Parents: 351bc03 fc0f247 Author: Jonathan Ellis <[email protected]> Authored: Mon Jan 14 16:29:52 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jan 14 16:29:52 2013 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/ColumnFamilyStore.java | 22 +----------- src/java/org/apache/cassandra/db/Memtable.java | 27 +++++++++++++- 2 files changed, 26 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/009a446b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/009a446b/src/java/org/apache/cassandra/db/Memtable.java ----------------------------------------------------------------------
