From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jan 2020 04:20:25 +0000 (-0600)
Subject: Merge PR #32725 into master
X-Git-Tag: v15.1.0~144
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=089e97c27013612672099281fad76746f19290e3;p=ceph.git

Merge PR #32725 into master

* refs/pull/32725/head:
	qa/tasks/ceph_manager: fix revive_osd path
	qa/tasks/ceph_manager: fix shell osd for ceph-objectstore-tool commands

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

089e97c27013612672099281fad76746f19290e3