]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #29089 into master
authorSage Weil <sage@redhat.com>
Mon, 22 Jul 2019 18:40:31 +0000 (13:40 -0500)
committerSage Weil <sage@redhat.com>
Mon, 22 Jul 2019 18:40:31 +0000 (13:40 -0500)
commit525ab21f716a6ce105fcfb1e4d313400e829ae31
treef9fc337dbb6028db5c979267b6f3fa85fc5d9f90
parentf3e5c5b90511cc3c12ee62c06ab64de978618208
parentb3cc451fc299c7d377196aaa9058026dad231721
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>
src/mon/MgrMonitor.cc