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 2013/07/24 18:31:08 UTC

[3/3] git commit: Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'

Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'


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

Branch: refs/heads/master
Commit: af5a8aa15950a2433caf3703804e63b4f913e813
Parents: 96bed81 44dfbf9
Author: Eric Newton <ec...@apache.org>
Authored: Wed Jul 24 12:30:57 2013 -0400
Committer: Eric Newton <ec...@apache.org>
Committed: Wed Jul 24 12:30:57 2013 -0400

----------------------------------------------------------------------
 .../apache/accumulo/trace/instrument/impl/MilliSpan.java  | 10 +++++-----
 .../accumulo/trace/instrument/impl/RootMilliSpan.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------