Merge pull request #15380 from xiexingguo/wip-cache-trim

author Sage Weil <sage@newdream.net>

Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)

committer GitHub <noreply@github.com>

Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)
author Sage Weil <sage@newdream.net>
Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)
committer GitHub <noreply@github.com>
Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)
committer	GitHub <noreply@github.com>
	Mon, 5 Jun 2017 18:35:01 +0000 (13:35 -0500)
		1	2
src/common/config_opts.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