Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT'
Conflicts:
test/system/auto/simple/simpleBalancer.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/aceb5fbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aceb5fbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aceb5fbe
Branch: refs/heads/master
Commit: aceb5fbea811fbcc8c346329de0b4173772544e3
Parents: b907102 0fe0a5a
Author: Eric Newton <eric.new...@gmail.com>
Authored: Tue Oct 22 14:55:15 2013 -0400
Committer: Eric Newton <eric.new...@gmail.com>
Committed: Tue Oct 22 14:55:15 2013 -0400
----------------------------------------------------------------------
test/system/auto/JavaTest.py | 1 +
test/system/auto/TestUtils.py | 3 ++-
test/system/auto/run.py | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
