Updated Branches: refs/heads/trunk 725251c3b -> 170146f64
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/170146f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/170146f6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/170146f6 Branch: refs/heads/trunk Commit: 170146f64891bffc27f81b80db63ecc84894a39d Parents: 725251c 38e145b Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Tue Mar 6 00:38:44 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Tue Mar 6 00:38:44 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/LeveledManifest.java | 18 +++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/170146f6/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
