Merge pull request #33910 from xiexingguo/wip-44532-2

author Xie Xingguo <xie.xingguo@zte.com.cn>

Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)

committer GitHub <noreply@github.com>

Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
committer GitHub <noreply@github.com>
Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
diff --cc src/osd/PeeringState.cc
Simple merge
diff --cc src/osd/PeeringState.h
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
committer	GitHub <noreply@github.com>
	Thu, 26 Mar 2020 00:10:22 +0000 (08:10 +0800)
		1	2
src/osd/PeeringState.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PeeringState.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history