Merge pull request #17320 from rzarzynski/wip-rgw-21148

author Matt Benjamin <mbenjamin@redhat.com>

Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)

committer GitHub <noreply@github.com>

Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)
committer GitHub <noreply@github.com>
Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)
diff --cc src/rgw/rgw_bucket.h
Simple merge
diff --cc src/rgw/rgw_common.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)
committer	GitHub <noreply@github.com>
	Mon, 18 Sep 2017 19:51:43 +0000 (15:51 -0400)
		1	2
src/rgw/rgw_bucket.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history