Merge pull request #16662 from ivancich/wip-dmclock-options-doc

author Sage Weil <sage@newdream.net>

Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)

committer GitHub <noreply@github.com>

Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)
author Sage Weil <sage@newdream.net>
Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)
committer GitHub <noreply@github.com>
Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)
committer	GitHub <noreply@github.com>
	Sat, 5 Aug 2017 18:36:37 +0000 (13:36 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history