Merge pull request #10655 from dachary/wip-16163-jewel

author Orit Wasserman <owasserm@redhat.com>

Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)

committer GitHub <noreply@github.com>

Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)
author Orit Wasserman <owasserm@redhat.com>
Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)
committer GitHub <noreply@github.com>
Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)
committer	GitHub <noreply@github.com>
	Mon, 22 Aug 2016 08:31:39 +0000 (10:31 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history