Merge pull request #13428 from xiexingguo/wip-flush-cache

author Kefu Chai <tchaikov@gmail.com>

Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)

committer GitHub <noreply@github.com>

Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)
committer GitHub <noreply@github.com>
Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)
committer	GitHub <noreply@github.com>
	Sat, 18 Feb 2017 08:45:36 +0000 (16:45 +0800)
		1	2
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history