Merge pull request #21029 from rzarzynski/wip-osd-close_op_ctx-nohobjcpy

author Kefu Chai <tchaikov@gmail.com>

Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)

committer GitHub <noreply@github.com>

Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)
committer GitHub <noreply@github.com>
Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)
diff --cc src/osd/PrimaryLogPG.h
Simple merge
diff --cc src/osd/osd_internal_types.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)
committer	GitHub <noreply@github.com>
	Fri, 13 Apr 2018 09:40:27 +0000 (17:40 +0800)
		1	2
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_internal_types.h	patch \|	diff1 \|	diff2 \|	blob \| history