Merge branch '1.5.2-SNAPSHOT' into 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/c8b78818 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c8b78818 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c8b78818 Branch: refs/heads/master Commit: c8b788189e6816cf810bb34959135f07f3bbe4e7 Parents: 2a17a7a 727bbf7 Author: Josh Elser <els...@apache.org> Authored: Thu Jun 26 18:21:46 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Jun 26 18:21:46 2014 -0400 ---------------------------------------------------------------------- proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c8b78818/proxy/src/main/java/org/apache/accumulo/proxy/Proxy.java ----------------------------------------------------------------------
