Merge PR #24158 into master

author Patrick Donnelly <pdonnell@redhat.com>

Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)

committer Patrick Donnelly <pdonnell@redhat.com>

Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)
author Patrick Donnelly <pdonnell@redhat.com>
Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)
committer Patrick Donnelly <pdonnell@redhat.com>
Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)
diff --cc doc/cephfs/multimds.rst
Simple merge
diff --cc doc/cephfs/upgrading.rst
Simple merge
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
author	Patrick Donnelly <pdonnell@redhat.com>
	Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)
committer	Patrick Donnelly <pdonnell@redhat.com>
	Mon, 24 Sep 2018 21:39:45 +0000 (14:39 -0700)
		1	2
doc/cephfs/multimds.rst	patch \|	diff1 \|	diff2 \|	blob \| history
doc/cephfs/upgrading.rst	patch \|	diff1 \|	diff2 \|	blob \| history
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history