Merge pull request #26160 from linuxbox2/wip-rgw-lc-header

author Matt Benjamin <mbenjamin@redhat.com>

Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)

committer GitHub <noreply@github.com>

Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)
committer GitHub <noreply@github.com>
Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 Jul 2019 20:49:38 +0000 (16:49 -0400)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history