Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9a9b2de8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9a9b2de8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9a9b2de8 Branch: refs/heads/master Commit: 9a9b2de83c1803d821e6380d10c0186c27cff2ae Parents: 6e16d55 67a4262 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Dec 10 20:13:55 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Dec 10 20:13:55 2014 -0500 ---------------------------------------------------------------------- .../examples/simple/client/TracingExample.java | 23 ++++++++++++-------- .../replication/merkle/cli/CompareTables.java | 12 ++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
