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/b37ee94b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b37ee94b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b37ee94b Branch: refs/heads/master Commit: b37ee94bacb87c22d942932b17954e52541d92a9 Parents: 535e2f3 7e5145a Author: Josh Elser <els...@apache.org> Authored: Wed May 27 16:46:23 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed May 27 16:46:23 2015 -0400 ---------------------------------------------------------------------- proxy/pom.xml | 5 + .../org/apache/accumulo/proxy/ProxyServer.java | 16 ++- .../apache/accumulo/proxy/ProxyServerTest.java | 114 +++++++++++++++++++ 3 files changed, 131 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b37ee94b/proxy/pom.xml ----------------------------------------------------------------------