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/cbe15d91 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbe15d91 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbe15d91 Branch: refs/heads/master Commit: cbe15d911e8deb1c775f925589d51e91b6938540 Parents: 58af0ce 2efeb52 Author: Josh Elser <els...@apache.org> Authored: Thu Nov 13 17:16:54 2014 -0800 Committer: Josh Elser <els...@apache.org> Committed: Thu Nov 13 17:16:54 2014 -0800 ---------------------------------------------------------------------- test/system/bench/cloudstone1/cloudstone1.py | 4 ++-- test/system/bench/lib/TeraSortBenchmark.py | 22 +++++++++++----------- test/system/bench/lib/slaves.py | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
