Merge pull request #17722 from amitkumar50/cov-rgw-6

author Matt Benjamin <mbenjamin@redhat.com>

Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)

committer GitHub <noreply@github.com>

Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)
author Matt Benjamin <mbenjamin@redhat.com>
Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)
committer GitHub <noreply@github.com>
Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)
diff --cc src/rgw/rgw_file.h
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Matt Benjamin <mbenjamin@redhat.com>
	Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)
committer	GitHub <noreply@github.com>
	Mon, 23 Oct 2017 21:00:37 +0000 (17:00 -0400)
		1	2
src/rgw/rgw_file.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history