Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b547531 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b547531 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b547531 Branch: refs/heads/master Commit: 9b5475314fcdd15459422ef7d33c2abca4eb25cc Parents: 0c92a63 a55ee6e Author: Josh Elser <[email protected]> Authored: Wed Jan 8 22:04:43 2014 -0500 Committer: Josh Elser <[email protected]> Committed: Wed Jan 8 22:04:43 2014 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b547531/pom.xml ----------------------------------------------------------------------
