From: Sage Weil <sage@redhat.com>
Date: Mon, 11 Mar 2019 14:27:13 +0000 (-0500)
Subject: Merge PR #26877 into master
X-Git-Tag: v14.2.0~74
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bf250344475e8ed260636a7a06d85c2f30120da;p=ceph.git

Merge PR #26877 into master

* refs/pull/26877/head:
	mgr/MgrStandby: exit with 0 result code, as if we'd done an orderly shutdown

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

7bf250344475e8ed260636a7a06d85c2f30120da