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/14ee1465 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14ee1465 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14ee1465 Branch: refs/heads/trunk Commit: 14ee1465b0b9b50f36021ffd6307f71329d835e8 Parents: 226a300 e9917c4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 3 11:13:56 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 3 11:13:56 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 7 ++- build.xml | 44 ++------------- src/java/org/apache/cassandra/db/Directories.java | 20 ++++++- .../cassandra/db/compaction/LeveledManifest.java | 18 +++--- 4 files changed, 36 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14ee1465/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14ee1465/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14ee1465/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
