From: Sage Weil Date: Sat, 7 Dec 2019 18:28:15 +0000 (-0600) Subject: Merge PR #32039 into master X-Git-Tag: v15.1.0~622 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86950ce9aad800687561e45693acd32b8d66d09b;p=ceph.git Merge PR #32039 into master * refs/pull/32039/head: test: Improve races by using kill_daemons which waits for OSDs terminate test: run-standalone.sh: Only run execs in the subdirectories of qa/standalone test: Use activate_osd() when restarting OSDs test: osd-scrub-snaps.sh: Fix race with osd restart and doing a scrub Reviewed-by: Neha Ojha --- 86950ce9aad800687561e45693acd32b8d66d09b