From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Feb 2021 22:25:01 +0000 (-0600)
Subject: Merge PR #39149 into master
X-Git-Tag: v17.1.0~3098
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fafdb1e47d6bbda1a7b5c6a96c4f06f9760729a0;p=ceph.git

Merge PR #39149 into master

* refs/pull/39149/head:
	qa/workunits/cephtool/test.sh: tolerate some settling for osd info vs dump test

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

fafdb1e47d6bbda1a7b5c6a96c4f06f9760729a0