Merge pull request #15217 from badone/wip-async-sleep-timer-fix

author Sage Weil <sage@newdream.net>

Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)

committer GitHub <noreply@github.com>

Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)
author Sage Weil <sage@newdream.net>
Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)
committer GitHub <noreply@github.com>
Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)
committer	GitHub <noreply@github.com>
	Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history