Merge pull request #10914 from batrick/mds-no-maxmds

author John Spray <jspray@redhat.com>

Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)

committer GitHub <noreply@github.com>

Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)
author John Spray <jspray@redhat.com>
Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)
committer GitHub <noreply@github.com>
Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)
committer	GitHub <noreply@github.com>
	Tue, 6 Sep 2016 11:50:20 +0000 (12:50 +0100)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history