Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/129b68c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/129b68c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/129b68c1 Branch: refs/heads/trunk Commit: 129b68c1c32d0c2d554f48cdd425ca95b5d18856 Parents: 610b134 53339a0 Author: Marcus Eriksson <[email protected]> Authored: Fri Jan 22 07:30:31 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jan 22 07:30:31 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../db/compaction/LeveledManifest.java | 34 ++++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/129b68c1/CHANGES.txt ----------------------------------------------------------------------
