]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #37952 from mgfritch/cephadm-json-decode
authorSebastian Wagner <sebastian.wagner@suse.com>
Tue, 8 Dec 2020 11:13:04 +0000 (12:13 +0100)
committerGitHub <noreply@github.com>
Tue, 8 Dec 2020 11:13:04 +0000 (12:13 +0100)
mgr/cephadm: handle JSONDecodeError

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/osd.py

Simple merge
Simple merge