You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@accumulo.apache.org by ec...@apache.org on 2014/12/16 21:42:18 UTC

[2/2] accumulo git commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/accumulo


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4b018487
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4b018487
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4b018487

Branch: refs/heads/master
Commit: 4b018487ae1be2dbaf79a1cb4723462e644fb378
Parents: 9f8f588 3fbbc82
Author: Eric Newton <Eric Newton>
Authored: Tue Dec 16 15:41:22 2014 -0500
Committer: Eric Newton <Eric Newton>
Committed: Tue Dec 16 15:41:22 2014 -0500

----------------------------------------------------------------------
 server/tracer/pom.xml                           |  5 ++
 .../apache/accumulo/tracer/ZooTraceClient.java  | 53 +++++++++++++++++---
 .../accumulo/tracer/ZooTraceClientTest.java     | 42 ++++++++++++++++
 .../tracer/src/test/resources/log4j.properties  | 21 ++++++++
 .../java/org/apache/accumulo/shell/Shell.java   | 12 ++---
 .../apache/accumulo/shell/ShellConfigTest.java  |  4 +-
 6 files changed, 121 insertions(+), 16 deletions(-)
----------------------------------------------------------------------