Merge pull request #19465 from shinobu-x/no_copy_ctor_assignment

author Kefu Chai <tchaikov@gmail.com>

Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)

committer GitHub <noreply@github.com>

Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)
committer GitHub <noreply@github.com>
Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)
diff --cc src/include/xlist.h
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)
committer	GitHub <noreply@github.com>
	Fri, 15 Dec 2017 07:16:03 +0000 (15:16 +0800)
		1	2
src/include/xlist.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history