Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)

committer Sage Weil <sage@redhat.com>

Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
author Sage Weil <sage@redhat.com>
Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
committer Sage Weil <sage@redhat.com>
Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 1 Aug 2014 14:08:28 +0000 (07:08 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history