Merge pull request #22533 from linuxbox2/wip-rgw-24507

author Matt Benjamin <mbenjamin@redhat.com>

Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)

committer GitHub <noreply@github.com>

Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)
committer GitHub <noreply@github.com>
Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)
diff --cc src/common/options.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)
committer	GitHub <noreply@github.com>
	Wed, 25 Jul 2018 18:41:27 +0000 (14:41 -0400)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history