Merge pull request #8002 from rzarzynski/wip-rgw-putobjmeta

author Yehuda Sadeh <yehuda@redhat.com>

Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)

committer Yehuda Sadeh <yehuda@redhat.com>

Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)
committer Yehuda Sadeh <yehuda@redhat.com>
Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)
committer	Yehuda Sadeh <yehuda@redhat.com>
	Wed, 16 Mar 2016 02:36:42 +0000 (19:36 -0700)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history