Merge pull request #31668 from shenhang/deny_reconnect_on_reboot

author Yan, Zheng <zyan@redhat.com>

Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)

committer GitHub <noreply@github.com>

Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)
author Yan, Zheng <zyan@redhat.com>
Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)
committer GitHub <noreply@github.com>
Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/mds/Server.cc
Simple merge
diff --cc src/mds/Server.h
Simple merge
author	Yan, Zheng <zyan@redhat.com>
	Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)
committer	GitHub <noreply@github.com>
	Thu, 26 Mar 2020 08:59:01 +0000 (16:59 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mds/Server.h	patch \|	diff1 \|	diff2 \|	blob \| history