Merge branch '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/af599213 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/af599213 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/af599213 Branch: refs/heads/master Commit: af599213114c2d22ef6d62765d57f11727efcfbe Parents: 3f21e5d 08a9804 Author: Bill Havanki <bhava...@cloudera.com> Authored: Thu Jan 16 15:12:48 2014 -0500 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Thu Jan 16 15:12:48 2014 -0500 ---------------------------------------------------------------------- .../tserver/log/TabletServerLogger.java | 2 +- .../apache/accumulo/test/randomwalk/State.java | 8 +++++ .../randomwalk/concurrent/CheckBalance.java | 36 +++++++++++++------- .../concurrent/ConcurrentFixture.java | 5 ++- 4 files changed, 36 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
