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/c63ee74b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c63ee74b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c63ee74b Branch: refs/heads/trunk Commit: c63ee74b597205dea9baf5f4ecc059da70d1be64 Parents: a94b173 cb9d388 Author: Marcus Eriksson <[email protected]> Authored: Fri Nov 7 13:44:37 2014 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Nov 7 13:44:37 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/db/compaction/LeveledManifest.java | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c63ee74b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c63ee74b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
