Merge pull request #14997 from ivancich/wip-bring-in-dmclock-p2

author Sage Weil <sage@newdream.net>

Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)

committer GitHub <noreply@github.com>

Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)
author Sage Weil <sage@newdream.net>
Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)
committer GitHub <noreply@github.com>
Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)
committer	GitHub <noreply@github.com>
	Mon, 26 Jun 2017 18:40:16 +0000 (13:40 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history