Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@redhat.com>

Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)

committer Sage Weil <sage@redhat.com>

Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
author Sage Weil <sage@redhat.com>
Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
committer Sage Weil <sage@redhat.com>
Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 Aug 2014 00:33:59 +0000 (17:33 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history