Merge pull request #31728 from luis-henrix/copy-from-notrunc

author Kefu Chai <kchai@redhat.com>

Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)

committer GitHub <noreply@github.com>

Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)
author Kefu Chai <kchai@redhat.com>
Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)
committer GitHub <noreply@github.com>
Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Kefu Chai <kchai@redhat.com>
	Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)
committer	GitHub <noreply@github.com>
	Mon, 6 Jan 2020 02:07:45 +0000 (10:07 +0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history