From: Sage Weil <sage@redhat.com>
Date: Tue, 19 Nov 2019 16:37:49 +0000 (-0600)
Subject: Merge PR #31672 into master
X-Git-Tag: v15.1.0~844
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=36f5fcbb97eb2b1bceb526331eb3464f460fc701;p=ceph.git

Merge PR #31672 into master

* refs/pull/31672/head:
	mgr/orch: adapt update_mgr/mon funcs to new parsing
	mgr/orch: improve commandline parsing

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

36f5fcbb97eb2b1bceb526331eb3464f460fc701