From: Sage Weil Date: Mon, 9 Mar 2020 20:28:19 +0000 (-0500) Subject: Merge PR #33809 into octopus X-Git-Tag: v15.1.1~57 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3212932ba1381bd6ae7c45051190cbe2c633944d;p=ceph.git Merge PR #33809 into octopus * refs/pull/33809/head: qa/standalone/scrub/osd-scrub-repair: force osdmap prop to osds qa/standalone/scrub/osd-scrub-test: wait longer for update Reviewed-by: David Zafman --- 3212932ba1381bd6ae7c45051190cbe2c633944d