Merge pull request #29859 from athanatos/sjust/wip-luminous-20924

author Yuri Weinstein <yweinste@redhat.com>

Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)

committer GitHub <noreply@github.com>

Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)
author Yuri Weinstein <yweinste@redhat.com>
Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)
committer GitHub <noreply@github.com>
Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osdc/Objecter.cc
Simple merge
author	Yuri Weinstein <yweinste@redhat.com>
	Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)
committer	GitHub <noreply@github.com>
	Wed, 2 Oct 2019 00:08:12 +0000 (17:08 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history