Updated Branches: refs/heads/cassandra-1.1 226a300ac -> 26c136d30
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/26c136d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26c136d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26c136d3 Branch: refs/heads/cassandra-1.1 Commit: 26c136d30f29c82e99b044e236efa0ef77f8a027 Parents: 226a300 83371eb Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Apr 3 18:11:09 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Apr 3 18:11:09 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 +- build.xml | 44 ++------------- .../cassandra/db/compaction/LeveledManifest.java | 18 +++--- 3 files changed, 15 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26c136d3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26c136d3/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
