Merge pull request #21718 from majianpeng/admin-socket-cleanup

author Kefu Chai <tchaikov@gmail.com>

Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)

committer GitHub <noreply@github.com>

Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)
committer GitHub <noreply@github.com>
Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/mds/MDSDaemon.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)
committer	GitHub <noreply@github.com>
	Sat, 2 Jun 2018 17:55:37 +0000 (01:55 +0800)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/MDSDaemon.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history