Merge pull request #10396 from zhouruisong/master

author Daniel Gryniewicz <dang@fprintf.net>

Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)

committer GitHub <noreply@github.com>

Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)
author Daniel Gryniewicz <dang@fprintf.net>
Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)
committer GitHub <noreply@github.com>
Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/CMakeLists.txt
Simple merge
diff --cc src/test/Makefile-client.am
Simple merge
author	Daniel Gryniewicz <dang@fprintf.net>
	Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)
committer	GitHub <noreply@github.com>
	Wed, 27 Jul 2016 16:20:54 +0000 (12:20 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile-client.am	patch \|	diff1 \|	diff2 \|	blob \| history