Updated Branches: refs/heads/cassandra-1.1 9418c2a2f -> 38e145bd2
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/38e145bd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38e145bd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38e145bd Branch: refs/heads/cassandra-1.1 Commit: 38e145bd21d44392fd35bb8820c6a48334471528 Parents: 9418c2a e58540f Author: Peter Schuller <peter.schul...@infidyne.com> Authored: Tue Mar 6 00:37:56 2012 -0800 Committer: Peter Schuller <peter.schul...@infidyne.com> Committed: Tue Mar 6 00:37:56 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/38e145bd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/38e145bd/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
