From: Sage Weil <sage@redhat.com>
Date: Mon, 22 Jul 2019 18:40:31 +0000 (-0500)
Subject: Merge PR #29089 into master
X-Git-Tag: v15.1.0~2137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=525ab21f716a6ce105fcfb1e4d313400e829ae31;p=ceph.git

Merge PR #29089 into master

* refs/pull/29089/head:
	mon/MgrMonitor: fix null deref when invalid formatter is specified

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
---

525ab21f716a6ce105fcfb1e4d313400e829ae31