From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jan 2020 15:18:49 +0000 (-0600)
Subject: Merge PR #32738 into master
X-Git-Tag: v15.1.0~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff41594adefb28488d2ab59b76b614d13cafd451;p=ceph.git

Merge PR #32738 into master

* refs/pull/32738/head:
	qa/standalone/misc/ok-to-stop: improve test
	qa/standalone/ceph-helpers: add wait_for_peered

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

ff41594adefb28488d2ab59b76b614d13cafd451