Merge pull request #14486 from dachary/wip-multiweight

author Sage Weil <sage@newdream.net>

Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)

committer GitHub <noreply@github.com>

Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)
author Sage Weil <sage@newdream.net>
Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)
committer GitHub <noreply@github.com>
Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/test/crush/crush.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)
committer	GitHub <noreply@github.com>
	Wed, 19 Apr 2017 22:07:19 +0000 (17:07 -0500)
		1	2
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/crush/crush.cc	patch \|	diff1 \|	diff2 \|	blob \| history