Merge pull request #18196 from liewegas/wip-bluestore-sync-onreadable

author Sage Weil <sage@newdream.net>

Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)

committer GitHub <noreply@github.com>

Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)
author Sage Weil <sage@newdream.net>
Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)
committer GitHub <noreply@github.com>
Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)
committer	GitHub <noreply@github.com>
	Tue, 19 Dec 2017 14:22:53 +0000 (08:22 -0600)
		1	2
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history