Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d6e0ca04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6e0ca04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6e0ca04 Branch: refs/heads/cassandra-2.0 Commit: d6e0ca043de2f64bda10470acf12c9d627b206fe Parents: 9e29619 7d3eef8 Author: Yuki Morishita <[email protected]> Authored: Wed Aug 21 15:35:19 2013 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed Aug 21 15:35:19 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../apache/cassandra/db/compaction/LeveledManifest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6e0ca04/CHANGES.txt ----------------------------------------------------------------------
