[4/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04d8cd8d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04d8cd8d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04d8cd8d Branch: refs/heads/1.6.0-SNAPSHOT Commit: 04d8cd8d4dbe6189a072a389344282513446dad7 Parents: 7d70ef5 bd970de Author: Eric Newton eric.new...@gmail.com Authored: Fri Feb 28 12:52:55 2014 -0500 Committer: Eric Newton eric.new...@gmail.com Committed: Fri Feb 28 12:52:55 2014 -0500 -- .../apache/accumulo/core/client/impl/Tables.java | 18 +++--- 1 file changed, 11 insertions(+), 7 deletions(-) --
[4/4] git commit: Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
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(-) --
