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/26d66914 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/26d66914 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/26d66914 Branch: refs/heads/master Commit: 26d66914a9b2b0ff4150a7144ab9fa4e5ce7bc03 Parents: 2e336b8 f996387 Author: Billie Rinaldi <[email protected]> Authored: Tue Apr 28 17:25:08 2015 -0700 Committer: Billie Rinaldi <[email protected]> Committed: Tue Apr 28 17:25:08 2015 -0700 ---------------------------------------------------------------------- .../org/apache/accumulo/core/trace/Span.java | 87 +------------------- .../gc/GarbageCollectWriteAheadLogs.java | 2 +- .../monitor/servlets/trace/ShowTrace.java | 10 +-- .../accumulo/monitor/ShowTraceLinkTypeTest.java | 3 +- .../accumulo/tracer/AsyncSpanReceiver.java | 13 +-- .../accumulo/tracer/SendSpansViaThrift.java | 9 +- .../apache/accumulo/tracer/TraceFormatter.java | 9 +- .../apache/accumulo/tracer/ZooTraceClient.java | 3 +- .../accumulo/tracer/thrift/RemoteSpan.java | 68 +++++++-------- server/tracer/src/main/thrift/tracer.thrift | 4 +- .../apache/accumulo/trace/instrument/Span.java | 20 +++-- 11 files changed, 70 insertions(+), 158 deletions(-) ----------------------------------------------------------------------
