Merge pull request #7741 from rjfd/wip-14527

author Matt Benjamin <mbenjamin@redhat.com>

Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)

committer GitHub <noreply@github.com>

Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)
committer GitHub <noreply@github.com>
Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/common/Makefile.am
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/MonMap.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)
committer	GitHub <noreply@github.com>
	Tue, 14 Jun 2016 19:38:03 +0000 (15:38 -0400)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history