Merge pull request #18473 from yuyuyu101/wip-objecter-mono

author Kefu Chai <tchaikov@gmail.com>

Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)

committer GitHub <noreply@github.com>

Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)
committer GitHub <noreply@github.com>
Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)
committer	GitHub <noreply@github.com>
	Wed, 25 Oct 2017 11:20:59 +0000 (19:20 +0800)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history