Merge pull request #17834 from rzarzynski/wip-rgw-21148-luminous

author Matt Benjamin <mbenjamin@redhat.com>

Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)

committer GitHub <noreply@github.com>

Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)
committer GitHub <noreply@github.com>
Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)
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
diff --cc src/rgw/rgw_rest_swift.h
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)
committer	GitHub <noreply@github.com>
	Sun, 15 Oct 2017 18:30:57 +0000 (14:30 -0400)
		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
src/rgw/rgw_rest_swift.h	patch \|	diff1 \|	diff2 \|	blob \| history