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