Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e446f0ad Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e446f0ad Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e446f0ad Branch: refs/heads/master Commit: e446f0ad960ac41fc5c6bef9f865d22419fd958e Parents: 9e89b65 67249ec Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Jun 15 17:50:57 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Jun 15 17:50:57 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/tracer/TraceServer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
