Merge pull request #27715 from pdvian/wip-39042-luminous

author Yuri Weinstein <yweinste@redhat.com>

Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)

committer GitHub <noreply@github.com>

Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)
committer GitHub <noreply@github.com>
Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)
diff --cc src/osd/PGLog.cc
Simple merge
diff --cc src/test/osd/TestPGLog.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)
committer	GitHub <noreply@github.com>
	Thu, 20 Jun 2019 00:08:17 +0000 (17:08 -0700)
		1	2
src/osd/PGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/TestPGLog.cc	patch \|	diff1 \|	diff2 \|	blob \| history