Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)
author Sage Weil <sage@redhat.com>
Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)
diff --cc configure.ac
Simple merge
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 16 Jul 2015 16:03:58 +0000 (12:03 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history