From: Sage Weil <sage@redhat.com>
Date: Fri, 6 Mar 2020 17:26:58 +0000 (-0600)
Subject: Merge PR #33779 into master
X-Git-Tag: v15.1.1~84
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=97c54ff9c5baa4b12285cde94077f487a6f4a544;p=ceph-ci.git

Merge PR #33779 into master

* refs/pull/33779/head:
	mgr/orch: fix ServiceSpec deserialization error

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
---

97c54ff9c5baa4b12285cde94077f487a6f4a544