Merge pull request #8121 from liewegas/wip-15136

author Sage Weil <sage@redhat.com>

Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)
author Sage Weil <sage@redhat.com>
Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)
diff --cc doc/cephfs/administration.rst
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)
		1	2
doc/cephfs/administration.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history