Merge branch 'cassandra-2.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/a9499e7d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9499e7d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9499e7d Branch: refs/heads/trunk Commit: a9499e7df09fa758191b4b6bc5600af09bed53de Parents: d3b53aa 7043a66 Author: Marcus Eriksson <[email protected]> Authored: Mon Apr 27 09:23:22 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Apr 27 09:23:22 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9499e7d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9499e7d/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
