Merge pull request #15292 from liewegas/wip-map-cache

author Sage Weil <sage@newdream.net>

Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)

committer GitHub <noreply@github.com>

Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)
author Sage Weil <sage@newdream.net>
Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)
committer GitHub <noreply@github.com>
Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)
committer	GitHub <noreply@github.com>
	Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history