Merge pull request #33084 from tchaikov/wip-crimson-pg-coll

author Kefu Chai <kchai@redhat.com>

Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)

committer GitHub <noreply@github.com>

Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)
author Kefu Chai <kchai@redhat.com>
Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)
committer GitHub <noreply@github.com>
Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)
diff --cc src/crimson/osd/pg.cc
Simple merge
diff --cc src/crimson/osd/pg.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)
committer	GitHub <noreply@github.com>
	Fri, 14 Feb 2020 03:21:52 +0000 (11:21 +0800)
		1	2
src/crimson/osd/pg.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crimson/osd/pg.h	patch \|	diff1 \|	diff2 \|	blob \| history