Merge pull request #14775 from Jing-Scott/wip-con-obj-bulkupload

author Radoslaw Zarzynski <rzarzynski@mirantis.com>

Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)

committer GitHub <noreply@github.com>

Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)
author Radoslaw Zarzynski <rzarzynski@mirantis.com>
Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)
committer GitHub <noreply@github.com>
Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)
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	Radoslaw Zarzynski <rzarzynski@mirantis.com>
	Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)
committer	GitHub <noreply@github.com>
	Mon, 1 May 2017 15:44:36 +0000 (17:44 +0200)
		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