Merge pull request #12427 from linuxbox2/wip-rgw-ldap-shutdown

author Yuri Weinstein <yweinste@redhat.com>

Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)

committer GitHub <noreply@github.com>

Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)
committer GitHub <noreply@github.com>
Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)
diff --cc src/rgw/rgw_main.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.cc
Simple merge
diff --cc src/rgw/rgw_rest_s3.h
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)
committer	GitHub <noreply@github.com>
	Fri, 16 Feb 2018 16:36:58 +0000 (08:36 -0800)
		1	2
src/rgw/rgw_main.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	patch \|	diff1 \|	diff2 \|	blob \| history