Merge pull request #7891 from rzarzynski/wip-rgw-content-disp

author Yehuda Sadeh <yehuda@redhat.com>

Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)

committer Yehuda Sadeh <yehuda@redhat.com>

Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)
author Yehuda Sadeh <yehuda@redhat.com>
Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)
committer Yehuda Sadeh <yehuda@redhat.com>
Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)
committer	Yehuda Sadeh <yehuda@redhat.com>
	Thu, 10 Mar 2016 23:41:27 +0000 (15:41 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history