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/40a87434 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40a87434 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40a87434 Branch: refs/heads/master Commit: 40a8743415fe7c961f5a1e09e3f4052a81750492 Parents: 23a0847 62821a0 Author: Josh Elser <els...@apache.org> Authored: Thu Oct 8 14:47:30 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Oct 8 14:47:30 2015 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------