Merge pull request #22848 from smithfarm/wip-24739-luminous

author Yuri Weinstein <yweinste@redhat.com>

Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)

committer GitHub <noreply@github.com>

Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)
committer GitHub <noreply@github.com>
Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)
diff --cc qa/standalone/ceph-helpers.sh
Simple merge
diff --cc qa/standalone/osd/repro_long_log.sh
Simple merge
diff --cc qa/standalone/scrub/osd-scrub-repair.sh
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)
committer	GitHub <noreply@github.com>
	Fri, 3 Aug 2018 15:21:13 +0000 (08:21 -0700)
		1	2
qa/standalone/ceph-helpers.sh	patch \|	diff1 \|	diff2 \|	blob \| history
qa/standalone/osd/repro_long_log.sh	patch \|	diff1 \|	diff2 \|	blob \| history
qa/standalone/scrub/osd-scrub-repair.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history