Merge pull request #25692 from Liuchang0812/fix-26835

author Casey Bodley <cbodley@users.noreply.github.com>

Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)

committer GitHub <noreply@github.com>

Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)
author Casey Bodley <cbodley@users.noreply.github.com>
Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)
committer GitHub <noreply@github.com>
Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)
diff --cc src/rgw/rgw_common.cc
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 Apr 2019 13:42:28 +0000 (09:42 -0400)
		1	2
src/rgw/rgw_common.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history