Merge pull request #23723 from xiexingguo/wip-list-missing

author Kefu Chai <tchaikov@gmail.com>

Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)

committer GitHub <noreply@github.com>

Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)
committer GitHub <noreply@github.com>
Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)
diff --cc qa/standalone/scrub/osd-scrub-repair.sh
Simple merge
diff --cc qa/tasks/ceph_manager.py
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)
committer	GitHub <noreply@github.com>
	Tue, 11 Sep 2018 12:25:21 +0000 (20:25 +0800)
		1	2
qa/standalone/scrub/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history
qa/tasks/ceph_manager.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history