Updated Branches: refs/heads/cassandra-1.0 062ee3f2e -> c9f88103d refs/heads/cassandra-1.1.0 83371ebe8 -> e9917c479 refs/heads/trunk 30a1e07c9 -> 4e8b92796
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/4e8b9279 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e8b9279 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e8b9279 Branch: refs/heads/trunk Commit: 4e8b927960c57a4dc024aed23c792b2526253ff1 Parents: 30a1e07 14ee146 Author: Jonathan Ellis <[email protected]> Authored: Tue Apr 3 11:14:05 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Apr 3 11:14:05 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 7 ++- build.xml | 47 +++------------ lib/snaptree-0.1-SNAPSHOT.jar | Bin 113450 -> 0 bytes lib/snaptree-0.1.jar | Bin 0 -> 55066 bytes src/java/org/apache/cassandra/db/Directories.java | 20 +++++- .../cassandra/db/compaction/LeveledManifest.java | 18 +++--- 6 files changed, 39 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e8b9279/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e8b9279/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e8b9279/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
