Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/757dedf7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/757dedf7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/757dedf7 Branch: refs/heads/master Commit: 757dedf7aa3fe314a3b8f772261d06d10ef1a152 Parents: c12679a b70b528 Author: Josh Elser <els...@apache.org> Authored: Mon Jul 11 14:41:53 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Mon Jul 11 14:41:53 2016 -0400 ---------------------------------------------------------------------- .../accumulo/test/proxy/SimpleProxyBase.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ----------------------------------------------------------------------
