Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 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/aff072d2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/aff072d2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/aff072d2 Branch: refs/heads/master Commit: aff072d24282e40a5d9823ed3fca6340b60420cb Parents: d497b80 b33559c Author: John Vines <vi...@apache.org> Authored: Thu Jan 30 18:28:57 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Thu Jan 30 18:28:57 2014 -0500 ---------------------------------------------------------------------- test/system/bench/lib/path.py | 7 +++++++ test/system/bench/lib/slaves.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
