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/fd46656d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fd46656d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fd46656d Branch: refs/heads/master Commit: fd46656d94214a6b5ae5a89cde266c25a15863eb Parents: 20ed2b0 d7c50d1 Author: Josh Elser <els...@apache.org> Authored: Fri Aug 26 13:24:47 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Aug 26 13:24:47 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/master/replication/WorkMaker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------