Merge branch '1.6.1-SNAPSHOT'
Conflicts:
fate/src/test/java/org/apache/accumulo/fate/zookeeper/ZooSessionTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51af1f17
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51af1f17
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51af1f17
Branch: refs/heads/master
Commit: 51af1f17a053a6ee3869b33be80b042e1f35d2ba
Parents: 3443794 10500f6
Author: Christopher Tubbs <ctubb...@apache.org>
Authored: Mon Aug 11 17:37:59 2014 -0400
Committer: Christopher Tubbs <ctubb...@apache.org>
Committed: Mon Aug 11 17:37:59 2014 -0400
----------------------------------------------------------------------
.../server/master/balancer/TabletBalancer.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/51af1f17/server/base/src/main/java/org/apache/accumulo/server/master/balancer/TabletBalancer.java
----------------------------------------------------------------------
