Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3c57b662 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3c57b662 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3c57b662 Branch: refs/heads/master Commit: 3c57b662f6dea71e03321bbd2d7654038ff9f501 Parents: 6d8f411 95be9f3 Author: Keith Turner <ktur...@apache.org> Authored: Tue Jan 24 12:12:31 2017 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Tue Jan 24 12:12:31 2017 -0500 ---------------------------------------------------------------------- .../ConfigurableCompactionStrategy.java | 64 ++++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) ----------------------------------------------------------------------