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/59f51bab Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/59f51bab Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/59f51bab Branch: refs/heads/master Commit: 59f51bab4fc03df6f7079e90934126eaabeef7fa Parents: fb349a4 5ef5b85 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Tue Jun 16 15:32:49 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Tue Jun 16 15:32:49 2015 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tracer/TraceServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
