From: Sage Weil <sage@redhat.com>
Date: Sat, 29 Feb 2020 03:32:36 +0000 (-0600)
Subject: Merge PR #33433 into master
X-Git-Tag: v15.1.1~197
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d8f80745349d306223083cc7bc116aea56cb91af;p=ceph.git

Merge PR #33433 into master

* refs/pull/33433/head:
	cephadm: also return JSON decode error.

Reviewed-by: Sage Weil <sage@redhat.com>
---

d8f80745349d306223083cc7bc116aea56cb91af