Merge pull request #29345 from majianpeng/bluestore-flush-waiter

author Kefu Chai <kchai@redhat.com>

Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)

committer GitHub <noreply@github.com>

Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)
author Kefu Chai <kchai@redhat.com>
Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)
committer GitHub <noreply@github.com>
Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)
committer	GitHub <noreply@github.com>
	Sun, 28 Jul 2019 14:51:00 +0000 (22:51 +0800)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history