Merge pull request #19283 from yehudasa/wip-rgw-mfa

author Yehuda Sadeh <yehuda@redhat.com>

Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)

committer GitHub <noreply@github.com>

Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)
committer GitHub <noreply@github.com>
Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)
committer	GitHub <noreply@github.com>
	Tue, 10 Apr 2018 14:59:10 +0000 (07:59 -0700)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history