Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f15a451d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f15a451d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f15a451d Branch: refs/heads/master Commit: f15a451d0d2fd03f11dbb52844d15ed60428ea84 Parents: 6021fdb f7be66e Author: Christopher Tubbs <[email protected]> Authored: Fri May 29 17:15:38 2015 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Fri May 29 17:15:38 2015 -0400 ---------------------------------------------------------------------- .../accumulo/master/tableOps/CloneTable.java | 17 +++++++++++++++-- .../accumulo/tracer/AsyncSpanReceiverTest.java | 14 +++++++------- 2 files changed, 22 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
