Updated Branches: refs/heads/cassandra-1.1 aa408603d -> 555b73808 refs/heads/cassandra-1.1.0 6423bfe79 -> dfea1200e refs/heads/trunk 0e85cce2d -> e36e68460
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/e36e6846 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e36e6846 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e36e6846 Branch: refs/heads/trunk Commit: e36e684606bb2aa834532b2451f247a95f5f7b17 Parents: 0e85cce 555b738 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Mar 16 11:59:09 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Mar 16 11:59:09 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../org/apache/cassandra/db/ColumnFamilyStore.java | 93 ++++---------- .../apache/cassandra/io/sstable/SSTableWriter.java | 7 +- test/unit/org/apache/cassandra/CleanupHelper.java | 8 +- 4 files changed, 42 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36e6846/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36e6846/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e36e6846/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java ----------------------------------------------------------------------
