]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #38998 from sebastian-philipp/fix-serve-handle-json-error
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 Jan 2021 11:56:29 +0000 (12:56 +0100)
committerGitHub <noreply@github.com>
Wed, 27 Jan 2021 11:56:29 +0000 (12:56 +0100)
mgr/cephadm: Properly handle JSON Decode error

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py

Simple merge
Simple merge