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/e42f7a85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e42f7a85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e42f7a85 Branch: refs/heads/trunk Commit: e42f7a858a8d5fd758be2cd6a812bc5e53a8d55a Parents: fc89a37 c35484a Author: Marcus Eriksson <[email protected]> Authored: Fri Jan 15 09:33:54 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Fri Jan 15 09:33:54 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 + pylib/cqlshlib/copyutil.py | 47 +++++++++++--------- .../db/compaction/CompactionManager.java | 6 ++- 3 files changed, 32 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e42f7a85/CHANGES.txt ----------------------------------------------------------------------
