Merge pull request #14557 from liewegas/wip-bluefs-balance-interval

author Sage Weil <sage@newdream.net>

Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -0500)

committer GitHub <noreply@github.com>

Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -0500)
author Sage Weil <sage@newdream.net>
Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -0500)
committer GitHub <noreply@github.com>
Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -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>
	Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -0500)
committer	GitHub <noreply@github.com>
	Thu, 20 Apr 2017 20:12:09 +0000 (15:12 -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