Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f295f8fe Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f295f8fe Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f295f8fe Branch: refs/heads/master Commit: f295f8fe5c4e2fe8ad07977dc3d4856899929f9b Parents: ab6ea92 c8b7881 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 26 18:30:00 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 26 18:30:00 2014 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 + 1 file changed, 1 insertion(+) ----------------------------------------------------------------------
