Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3dc9b373 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3dc9b373 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3dc9b373 Branch: refs/heads/master Commit: 3dc9b373d0fb9a78efefefc640e0e395e42ce1c7 Parents: 8e0f19a 037c138 Author: Sean Busbey <bus...@cloudera.com> Authored: Fri Dec 9 15:39:14 2016 -0600 Committer: Sean Busbey <bus...@cloudera.com> Committed: Fri Dec 9 15:39:14 2016 -0600 ---------------------------------------------------------------------- .../org/apache/accumulo/tracer/TraceServer.java | 76 ++++++++++++-------- 1 file changed, 48 insertions(+), 28 deletions(-) ----------------------------------------------------------------------