Merge pull request #13968 from dzafman/wip-15912-followon

author Sage Weil <sage@newdream.net>

Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)

committer GitHub <noreply@github.com>

Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)
author Sage Weil <sage@newdream.net>
Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)
committer GitHub <noreply@github.com>
Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)
diff --cc src/include/rados.h
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)
committer	GitHub <noreply@github.com>
	Mon, 17 Apr 2017 21:42:13 +0000 (16:42 -0500)
		1	2
src/include/rados.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history