]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92c3989 880c0b7)
Merge PR #33779 into master
authorSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 17:26:58 +0000 (11:26 -0600)
committerSage Weil <sage@redhat.com>
Fri, 6 Mar 2020 17:26:58 +0000 (11:26 -0600)
* refs/pull/33779/head:
mgr/orch: fix ServiceSpec deserialization error

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.