Merge pull request #13217 from liewegas/wip-bluestore-prefer-wal-size

author Sage Weil <sage@newdream.net>

Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)

committer GitHub <noreply@github.com>

Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)
author Sage Weil <sage@newdream.net>
Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)
committer GitHub <noreply@github.com>
Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
diff --cc src/test/objectstore/store_test.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)
committer	GitHub <noreply@github.com>
	Wed, 8 Mar 2017 19:38:54 +0000 (13:38 -0600)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history