Merge pull request #18368 from kungf/scrub_week_day_bound

author Kefu Chai <tchaikov@gmail.com>

Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)

committer GitHub <noreply@github.com>

Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)
committer GitHub <noreply@github.com>
Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)
diff --cc src/common/legacy_config_opts.h
Simple merge
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)
committer	GitHub <noreply@github.com>
	Sat, 21 Oct 2017 19:33:14 +0000 (03:33 +0800)
		1	2
src/common/legacy_config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history