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/036e739b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/036e739b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/036e739b Branch: refs/heads/master Commit: 036e739ba6d6fb498277f3a67c73aee7094a49cc Parents: a689f3a 40a8743 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Oct 13 15:48:54 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Oct 13 15:48:54 2015 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
