Updated Branches: refs/heads/cassandra-1.1 aa7dafaca -> 6ad7d45ad refs/heads/trunk 85fc72be8 -> 0666e1952
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/0666e195 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0666e195 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0666e195 Branch: refs/heads/trunk Commit: 0666e1952b92fec067ae255021fa384b02ac51f0 Parents: 85fc72b 6ad7d45 Author: Jonathan Ellis <[email protected]> Authored: Mon Sep 17 12:37:19 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Sep 17 12:37:19 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/LeveledManifest.java | 39 +++++++++++---- .../apache/cassandra/tools/StandaloneScrubber.java | 27 +---------- 3 files changed, 31 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0666e195/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0666e195/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0666e195/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ----------------------------------------------------------------------
