Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b29eeaa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b29eeaa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b29eeaa Branch: refs/heads/master Commit: 9b29eeaa9de6cb690dbc314e0428f78949d729eb Parents: c16b6ae 8ec4cb8 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Oct 22 10:37:48 2013 -0400 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Oct 22 10:37:48 2013 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/proxy/ProxyServer.java | 12 +++++----- .../org/apache/accumulo/proxy/SimpleTest.java | 24 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
