Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1f40320 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1f40320 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1f40320 Branch: refs/heads/master Commit: d1f4032055752488b2717b4c088ba72f577be183 Parents: 7dea181 44bf5ed Author: Josh Elser <els...@apache.org> Authored: Sun Oct 5 21:36:11 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun Oct 5 21:36:11 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/functional/SimpleBalancerFairnessIT.java | 3 +++ 1 file changed, 3 insertions(+) ----------------------------------------------------------------------