git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: dbdc551 ac73ccc)

author	Sage Weil <sage@redhat.com>
	Tue, 3 Mar 2020 21:43:33 +0000 (15:43 -0600)
committer	Sage Weil <sage@redhat.com>
	Tue, 3 Mar 2020 21:43:33 +0000 (15:43 -0600)
commit	023497df6d38a4cfdce7dd2a8a9f92363cf57b5c
tree	d446dba5d116d6449d9b96e06e24fce65b93c455	tree \| snapshot
parent	dbdc551b9ab58ff038abc7c5fb89313349555e8c	commit \| diff
parent	ac73ccc0b1f5a8d27d87416810a8f8e9724a97bc	commit \| diff

Merge PR #33678 into master

* refs/pull/33678/head:
mgr/cephadm: fix upgrade when daemon is stopped

Reviewed-by: Michael Fritch <mfritch@suse.com>

src/pybind/mgr/cephadm/module.py

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