Merge branch 'next'

author Sage Weil <sage@inktank.com>

Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)
author Sage Weil <sage@inktank.com>
Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)
diff --cc src/ceph.in
Simple merge
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mon/AuthMonitor.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 19 Jun 2013 16:58:54 +0000 (09:58 -0700)
		1	2
src/ceph.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/AuthMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history