]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3e5c5b b3cc451)
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)
* 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>
1  2 
src/mon/MgrMonitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/MgrMonitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.