Merge pull request #5118 from theanalyst/wip-12042-hammer

author Loic Dachary <loic@dachary.org>

Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)

committer Loic Dachary <loic@dachary.org>

Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)
author Loic Dachary <loic@dachary.org>
Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)
committer Loic Dachary <loic@dachary.org>
Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_rest.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)
committer	Loic Dachary <loic@dachary.org>
	Fri, 31 Jul 2015 18:55:29 +0000 (20:55 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest.cc	patch \|	diff1 \|	diff2 \|	blob \| history