Merge pull request #19958 from renhwztetecs/renhw-wip-osd-sighup

author Kefu Chai <tchaikov@gmail.com>

Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)

committer GitHub <noreply@github.com>

Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)
committer GitHub <noreply@github.com>
Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/mgr/MgrStandby.cc
Simple merge
diff --cc src/rgw/rgw_main.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)
committer	GitHub <noreply@github.com>
	Wed, 7 Feb 2018 14:40:59 +0000 (22:40 +0800)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/MgrStandby.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history