ACCUMULO-4016 resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4623103e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4623103e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4623103e Branch: refs/heads/master Commit: 4623103e2644e46eb06d8a0a0cddf9ac8f6e622e Parents: 01234be a39b3f6 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Fri Oct 2 14:42:19 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Fri Oct 2 14:42:19 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
