Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25b99c25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25b99c25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25b99c25 Branch: refs/heads/ACCUMULO-4173 Commit: 25b99c258be3768d144338548d1f14aeed4b8767 Parents: 3525269 0f6e5ed Author: Josh Elser <els...@apache.org> Authored: Mon Apr 11 13:54:11 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Apr 11 13:54:11 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
