[1/3] accumulo git commit: ACCUMULO-4353: Stabilize tablet assignment during transient failure

Repository: accumulo Updated Branches: refs/heads/master 930592f5e -> ee8e0705c http://git-wip-us.apache.org/repos/asf/accumulo/blob/3e5524c3/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java -- diff --git

[2/3] accumulo git commit: ACCUMULO-4353: Stabilize tablet assignment during transient failure

ACCUMULO-4353: Stabilize tablet assignment during transient failure Squashed the following commits, cherry picked them from master to 1.8 and then resolved conflicts. commit 2e30d9178ec4352eaa724d2a9d5ea033f90e7d67 Author: Shawn Walker Date: Mon Jul 11 12:15:57 2016 -0400 ACCUMULO-4353:

[3/3] accumulo git commit: Merge branch '1.8'

Merge branch '1.8' Conflicts: minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ee8e0705 Tree: http://git-wip-us.apache.

[1/2] accumulo git commit: ACCUMULO-4353: Stabilize tablet assignment during transient failure

Repository: accumulo Updated Branches: refs/heads/1.8 3c88febfd -> 3e5524c3c http://git-wip-us.apache.org/repos/asf/accumulo/blob/3e5524c3/server/master/src/main/java/org/apache/accumulo/master/MasterTime.java -- diff --git a/

[2/2] accumulo git commit: ACCUMULO-4353: Stabilize tablet assignment during transient failure

ACCUMULO-4353: Stabilize tablet assignment during transient failure Squashed the following commits, cherry picked them from master to 1.8 and then resolved conflicts. commit 2e30d9178ec4352eaa724d2a9d5ea033f90e7d67 Author: Shawn Walker Date: Mon Jul 11 12:15:57 2016 -0400 ACCUMULO-4353:

[1/2] accumulo git commit: ACCUMULO-4128: Use setiter instead of setscaniter as it does not exist in 2.0. Added more output validation in the test to catch this in the future.

Repository: accumulo Updated Branches: refs/heads/master 621e0f26e -> 930592f5e ACCUMULO-4128: Use setiter instead of setscaniter as it does not exist in 2.0. Added more output validation in the test to catch this in the future. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo C

[2/2] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/930592f5 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/930592f5 Diff: http://git-wip-