]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33809 into octopus
authorSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 20:28:19 +0000 (15:28 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 20:28:19 +0000 (15:28 -0500)
commit3212932ba1381bd6ae7c45051190cbe2c633944d
tree42422df663d21550646fa5875fd60edafdfb6a26
parentcf38372782bce46cccda6c9b98149d7807be75f5
parent0447ed0ff94a333eb82a769de3a1ad99123340bf
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 <dzafman@redhat.com>
qa/standalone/scrub/osd-scrub-repair.sh