Merge pull request #3575 from dachary/wip-9479-rgw-giant

author Loic Dachary <ldachary@redhat.com>

Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)

committer Loic Dachary <ldachary@redhat.com>

Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)
author Loic Dachary <ldachary@redhat.com>
Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)
committer Loic Dachary <ldachary@redhat.com>
Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Loic Dachary <ldachary@redhat.com>
	Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)
committer	Loic Dachary <ldachary@redhat.com>
	Tue, 10 Feb 2015 20:54:13 +0000 (21:54 +0100)
		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_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history