Merge pull request #21898 from adamemerson/wip-fedora28

author Kefu Chai <tchaikov@gmail.com>

Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)

committer GitHub <noreply@github.com>

Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)
committer GitHub <noreply@github.com>
Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)
diff --cc src/CMakeLists.txt
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)
committer	GitHub <noreply@github.com>
	Thu, 10 May 2018 10:54:38 +0000 (18:54 +0800)
		1	2
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history