Merge pull request #9589 from zhouruisong/master

author Daniel Gryniewicz <dang@fprintf.net>

Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)

committer GitHub <noreply@github.com>

Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)
author Daniel Gryniewicz <dang@fprintf.net>
Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)
committer GitHub <noreply@github.com>
Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rest.cc
Simple merge
author	Daniel Gryniewicz <dang@fprintf.net>
	Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)
committer	GitHub <noreply@github.com>
	Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)
		1	2
src/common/config_opts.h	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
src/rgw/rgw_rest.cc	patch \|	diff1 \|	diff2 \|	blob \| history