Merge pull request #15684 from badone/wip-refactor-of-osdmap-methods

author Brad Hubbard <badone@users.noreply.github.com>

Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)

committer GitHub <noreply@github.com>

Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)
author Brad Hubbard <badone@users.noreply.github.com>
Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)
committer GitHub <noreply@github.com>
Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Brad Hubbard <badone@users.noreply.github.com>
	Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)
committer	GitHub <noreply@github.com>
	Thu, 15 Jun 2017 02:58:17 +0000 (12:58 +1000)
		1	2
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history