Merge pull request #5718 from dachary/wip-12859-hammer

author Yehuda Sadeh <yehuda@redhat.com>

Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)

committer Yehuda Sadeh <yehuda@redhat.com>

Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)
committer Yehuda Sadeh <yehuda@redhat.com>
Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_rest.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)
committer	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 12 Oct 2015 15:11:16 +0000 (08:11 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history