Merge pull request #15958 from liewegas/wip-mgr-modules

author John Spray <jspray@redhat.com>

Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)

committer GitHub <noreply@github.com>

Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)
author John Spray <jspray@redhat.com>
Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)
committer GitHub <noreply@github.com>
Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)
diff --cc doc/release-notes.rst
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/MonCommands.h
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)
committer	GitHub <noreply@github.com>
	Tue, 4 Jul 2017 23:04:59 +0000 (00:04 +0100)
		1	2
doc/release-notes.rst	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history