Merge pull request #15176 from SUSE/wip-mgr-fix-help

author Sage Weil <sage@newdream.net>

Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)

committer GitHub <noreply@github.com>

Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)
author Sage Weil <sage@newdream.net>
Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)
committer GitHub <noreply@github.com>
Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/mgr/MgrStandby.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)
committer	GitHub <noreply@github.com>
	Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mgr/MgrStandby.h	patch \|	diff1 \|	diff2 \|	blob \| history