Merge pull request #9644 from stiopaa1/osdc_ObjectCacher_const

author Sage Weil <sage@redhat.com>

Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)

committer GitHub <noreply@github.com>

Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)
author Sage Weil <sage@redhat.com>
Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)
committer GitHub <noreply@github.com>
Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)
diff --cc src/osdc/ObjectCacher.cc
Simple merge
diff --cc src/osdc/ObjectCacher.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)
committer	GitHub <noreply@github.com>
	Tue, 20 Sep 2016 11:56:27 +0000 (06:56 -0500)
		1	2
src/osdc/ObjectCacher.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/ObjectCacher.h	patch \|	diff1 \|	diff2 \|	blob \| history