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/eeca25db Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eeca25db Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eeca25db Branch: refs/heads/master Commit: eeca25db8ce264293fbeda9c4601e015d8c2baa5 Parents: 9cf9aaa d81ef22 Author: Josh Elser <els...@apache.org> Authored: Wed May 13 16:30:37 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 13 16:30:37 2015 -0400 ---------------------------------------------------------------------- .../accumulo/test/proxy/SimpleProxyBase.java | 1201 +++++++++++------- .../accumulo/test/proxy/TBinaryProxyIT.java | 12 +- .../accumulo/test/proxy/TCompactProxyIT.java | 11 +- .../test/proxy/TJsonProtocolProxyIT.java | 12 +- .../accumulo/test/proxy/TTupleProxyIT.java | 12 +- 5 files changed, 746 insertions(+), 502 deletions(-) ----------------------------------------------------------------------
