Merge pull request #21242 from majianpeng/objecter-calc-budget

author Kefu Chai <tchaikov@gmail.com>

Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)

committer GitHub <noreply@github.com>

Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)
committer GitHub <noreply@github.com>
Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)
diff --cc src/osdc/Objecter.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)
committer	GitHub <noreply@github.com>
	Fri, 4 May 2018 01:16:14 +0000 (09:16 +0800)
		1	2
src/osdc/Objecter.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history