From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Jun 2018 18:04:56 +0000 (-0500)
Subject: Merge PR #22554 into master
X-Git-Tag: v14.0.1~1114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70ba58e9e8a3ad5e2870d1038359ec517a4898b2;p=ceph.git

Merge PR #22554 into master

* refs/pull/22554/head:
	qa/standalone/ceph-helpers.sh: Fixing comment for wait_for_health()
	tests: Protecting rados bench against endless loop
	qa/standalone/ceph-helpers.sh: Defining custom timeout for wait_for_clean()

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
---

70ba58e9e8a3ad5e2870d1038359ec517a4898b2