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/72bacc88 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72bacc88 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72bacc88 Branch: refs/heads/master Commit: 72bacc8832375b803abf047417dd64e60d364fb4 Parents: 489c927 f41a253 Author: Eric Newton <[email protected]> Authored: Thu Apr 23 12:02:32 2015 -0400 Committer: Eric Newton <[email protected]> Committed: Thu Apr 23 12:02:32 2015 -0400 ---------------------------------------------------------------------- .../src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
