Merge pull request #27003 from tchaikov/wip-crimson-for-classic

author Kefu Chai <tchaikov@gmail.com>

Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)

committer GitHub <noreply@github.com>

Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)
committer GitHub <noreply@github.com>
Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)
committer	GitHub <noreply@github.com>
	Wed, 20 Mar 2019 06:38:22 +0000 (14:38 +0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history