Merge pull request #29651 from rzarzynski/wip-crimson-cls

author Kefu Chai <kchai@redhat.com>

Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)

committer GitHub <noreply@github.com>

Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)
author Kefu Chai <kchai@redhat.com>
Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)
committer GitHub <noreply@github.com>
Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)
committer	GitHub <noreply@github.com>
	Sun, 25 Aug 2019 07:25:41 +0000 (15:25 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history