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/c1af1db1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1af1db1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1af1db1 Branch: refs/heads/trunk Commit: c1af1db17cd7c2d6dc778de777a50acc3e553a27 Parents: 64bc458 c1a1a00 Author: Marcus Eriksson <[email protected]> Authored: Mon Apr 7 08:49:33 2014 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Apr 7 08:49:33 2014 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/compaction/LeveledManifest.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
