Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)
author Sage Weil <sage@inktank.com>
Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)
diff --cc ceph.spec.in
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 27 Apr 2013 01:12:24 +0000 (18:12 -0700)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history