Merge pull request #14902 from liewegas/wip-upmap

author Sage Weil <sage@newdream.net>

Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)

committer GitHub <noreply@github.com>

Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)
author Sage Weil <sage@newdream.net>
Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)
committer GitHub <noreply@github.com>
Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)
diff --cc src/crush/CrushWrapper.cc
Simple merge
diff --cc src/crush/CrushWrapper.h
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)
committer	GitHub <noreply@github.com>
	Wed, 17 May 2017 15:29:28 +0000 (10:29 -0500)
		1	2
src/crush/CrushWrapper.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/crush/CrushWrapper.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history