Merge pull request #13136 from liewegas/wip-scrub-waitlist

author Sage Weil <sage@newdream.net>

Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)

committer GitHub <noreply@github.com>

Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
author Sage Weil <sage@newdream.net>
Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
committer GitHub <noreply@github.com>
Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
committer	GitHub <noreply@github.com>
	Wed, 1 Feb 2017 20:49:46 +0000 (14:49 -0600)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history