Merge pull request #10710 from rzarzynski/wip-16393-jewel

author Loic Dachary <loic@dachary.org>

Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)

committer GitHub <noreply@github.com>

Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)
author Loic Dachary <loic@dachary.org>
Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)
committer GitHub <noreply@github.com>
Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)
committer	GitHub <noreply@github.com>
	Mon, 22 Aug 2016 08:02:20 +0000 (10:02 +0200)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history