Merge branch '1.5.1-SNAPSHOT' into 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/14d6b0bb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/14d6b0bb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/14d6b0bb Branch: refs/heads/master Commit: 14d6b0bb60e38a153e13effe2412f20f97ab9607 Parents: 812df58 41ce56a Author: Mike Drob <md...@cloudera.com> Authored: Mon Feb 24 12:27:03 2014 -0500 Committer: Mike Drob <md...@cloudera.com> Committed: Mon Feb 24 12:27:03 2014 -0500 ---------------------------------------------------------------------- .../accumulo/trace/instrument/TraceProxy.java | 37 ++++++++++++------- .../accumulo/trace/instrument/TracerTest.java | 38 ++++++++++++++++++++ 2 files changed, 63 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
