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/4ae62e64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ae62e64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ae62e64 Branch: refs/heads/trunk Commit: 4ae62e64b6d993bdef218762fba5e0d9a3505e5d Parents: 84326c7 257dbfd Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 2 12:31:07 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 2 12:31:07 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/db/compaction/LeveledManifest.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ae62e64/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ae62e64/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
