Merge PR #26027 into master

author Sage Weil <sage@redhat.com>

Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)

committer Sage Weil <sage@redhat.com>

Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)
author Sage Weil <sage@redhat.com>
Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)
committer Sage Weil <sage@redhat.com>
Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)
diff --cc doc/man/8/ceph.rst
Simple merge
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)
committer	Sage Weil <sage@redhat.com>
	Thu, 7 Mar 2019 12:32:30 +0000 (06:32 -0600)
		1	2
doc/man/8/ceph.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history