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/23a08473 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/23a08473 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/23a08473 Branch: refs/heads/master Commit: 23a084737774d8d26edb8d646831f52cd6251b65 Parents: 29c7eeb 8f37693 Author: Adam Fuchs <a...@sqrrl.com> Authored: Thu Oct 8 10:52:35 2015 -0400 Committer: Adam Fuchs <a...@sqrrl.com> Committed: Thu Oct 8 10:52:35 2015 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
