Merge pull request #13307 from songbaisen/s12

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)

committer GitHub <noreply@github.com>

Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)
committer GitHub <noreply@github.com>
Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)
committer	GitHub <noreply@github.com>
	Tue, 14 Feb 2017 17:57:52 +0000 (09:57 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history