Merge pull request #16045 from Liuchang0812/wip-compact-osd-feature

author Kefu Chai <tchaikov@gmail.com>

Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)

committer GitHub <noreply@github.com>

Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)
committer GitHub <noreply@github.com>
Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)
diff --cc src/os/ObjectStore.h
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)
committer	GitHub <noreply@github.com>
	Sat, 15 Jul 2017 02:57:13 +0000 (10:57 +0800)
		1	2
src/os/ObjectStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history