]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13492 from shinobu-x/wip-18516-jewel
authorNathan Cutler <presnypreklad@gmail.com>
Wed, 12 Apr 2017 09:06:40 +0000 (11:06 +0200)
committerGitHub <noreply@github.com>
Wed, 12 Apr 2017 09:06:40 +0000 (11:06 +0200)
jewel: build/ops: "osd marked itself down" will not recognised if host runs mon + osd on shutdown/reboot

Reviewed-by: Nathan Cutler <ncutler@suse.com>

Trivial merge