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: ae60fd9 66690ea)

author	Sage Weil <sage@redhat.com>
	Mon, 9 Dec 2019 21:34:57 +0000 (15:34 -0600)
committer	Sage Weil <sage@redhat.com>
	Mon, 9 Dec 2019 21:34:57 +0000 (15:34 -0600)
commit	bffe2dd9e986077b74772978f7e9ab9094d857a5
tree	47e0cdb35913e9262ea6d17ae3ec867fc9dacf94	tree \| snapshot
parent	ae60fd9519b5d210336aa8298d6ddd6714e79799	commit \| diff
parent	66690ea3143ac5097f7c7f3118f2d00fed30cc4b	commit \| diff

Merge PR #32046 into master

* refs/pull/32046/head:
mgr/DaemonServer: fix 'osd ok-to-stop' for EC pools

Reviewed-by: Neha Ojha <nojha@redhat.com>

src/mgr/DaemonServer.cc

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