Merge pull request #24004 from xiexingguo/wip-yet-more-async-fixes

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

Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)

committer GitHub <noreply@github.com>

Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)
committer GitHub <noreply@github.com>
Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)
committer	GitHub <noreply@github.com>
	Thu, 20 Sep 2018 06:49:31 +0000 (14:49 +0800)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history