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/0f78d23d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f78d23d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f78d23d Branch: refs/heads/master Commit: 0f78d23d0accb2f1cd10843c75862f3875b8fd92 Parents: e9c23fa 14d6b0b Author: Mike Drob <md...@cloudera.com> Authored: Mon Feb 24 12:32:29 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Mon Feb 24 12:32:29 2014 -0500 ---------------------------------------------------------------------- .../accumulo/trace/instrument/TraceProxy.java | 37 ++++++++++++------- .../accumulo/trace/instrument/TracerTest.java | 38 ++++++++++++++++++++ 2 files changed, 63 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
