git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

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

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 48ce737 e0e87da)

author	Sage Weil <sage@newdream.net>
	Fri, 14 Jul 2017 14:04:16 +0000 (09:04 -0500)
committer	GitHub <noreply@github.com>
	Fri, 14 Jul 2017 14:04:16 +0000 (09:04 -0500)
commit	7e142534bc1e23ed0feeaed9c1f47e9a242f2349
tree	f1c83ba024ad12a8bb96a8801e533d3ccd129aa0	tree \| snapshot
parent	48ce73722e999fe7ec0b459a0a6d20496053644c	commit \| diff
parent	e0e87da6529d2c7c785aebd2aca88a517e150d0c	commit \| diff

Merge pull request #16020 from jcsp/wip-20383

mgr: clean up daemon start process

Reviewed-by: Sage Weil <sage@redhat.com>

src/mgr/Mgr.cc	diff1 \|	diff2 \|	blob \| history
src/mgr/Mgr.h	diff1 \|	diff2 \|	blob \| history
src/mgr/MgrStandby.cc	diff1 \|	diff2 \|	blob \| history
src/mon/MgrMonitor.cc	diff1 \|	diff2 \|	blob \| history

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