From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Mar 2020 14:58:42 +0000 (-0500)
Subject: Merge PR #34190 into octopus
X-Git-Tag: v15.2.1~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8b2c6ef1486f110f1b92d0c4af62cc10ad98b8f;p=ceph.git

Merge PR #34190 into octopus

* refs/pull/34190/head:
	mgr/cephadm: fix 'orch ps --refresh'

Reviewed-by: Michael Fritch <mfritch@suse.com>
---

b8b2c6ef1486f110f1b92d0c4af62cc10ad98b8f