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/7dc37367 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7dc37367 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7dc37367 Branch: refs/heads/master Commit: 7dc3736754a58b35065e70b879d7aea5f15e6119 Parents: 905a987 e35e189 Author: Josh Elser <[email protected]> Authored: Tue Dec 1 21:20:20 2015 -0500 Committer: Josh Elser <[email protected]> Committed: Tue Dec 1 21:20:20 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/proxy/Proxy.java | 1 - .../apache/accumulo/server/rpc/RpcWrapperTest.java | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
