Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Conflicts:
test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/91eb87c4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/91eb87c4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/91eb87c4
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 91eb87c4891f7b04cb8777a171a4d9654463f1ee
Parents: dd7e593 6c91e34
Author: Eric Newton <eric.new...@gmail.com>
Authored: Tue Feb 18 15:07:56 2014 -0500
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Tue Feb 18 15:07:56 2014 -0500
----------------------------------------------------------------------
.../accumulo/test/DeleteTableDuringSplitIT.java | 125 -------------------
.../functional/DeleteTableDuringSplitIT.java | 86 +++++++++++++
2 files changed, 86 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
