Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)
author Sage Weil <sage@inktank.com>
Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)
diff --cc src/mon/AuthMonitor.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_bucket.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 10 Jan 2014 21:57:04 +0000 (13:57 -0800)
		1	2
src/mon/AuthMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.h	patch \|	diff1 \|	diff2 \|	blob \| history