Merge pull request #15291 from liewegas/wip-osdmap-pgtemp

author Sage Weil <sage@newdream.net>

Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)

committer GitHub <noreply@github.com>

Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)
author Sage Weil <sage@newdream.net>
Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)
committer GitHub <noreply@github.com>
Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)
diff --cc src/include/buffer.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)
committer	GitHub <noreply@github.com>
	Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)
		1	2
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history