Merge pull request #20722 from theanalyst/wip-luminous-23221

author Yuri Weinstein <yweinste@redhat.com>

Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)

committer GitHub <noreply@github.com>

Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)
committer GitHub <noreply@github.com>
Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)
diff --cc debian/control
Simple merge
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_main.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)
committer	GitHub <noreply@github.com>
	Thu, 5 Apr 2018 20:09:32 +0000 (13:09 -0700)
		1	2
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history