Merge pull request #978 from ceph/wip-3454

author Josh Durgin <josh.durgin@inktank.com>

Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)

committer Josh Durgin <josh.durgin@inktank.com>

Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)
author Josh Durgin <josh.durgin@inktank.com>
Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)
committer Josh Durgin <josh.durgin@inktank.com>
Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Josh Durgin <josh.durgin@inktank.com>
	Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)
committer	Josh Durgin <josh.durgin@inktank.com>
	Wed, 15 Jan 2014 23:28:31 +0000 (15:28 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history