Merge pull request #13898 from songbaisen/m5

author Sage Weil <sage@newdream.net>

Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)

committer GitHub <noreply@github.com>

Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)
author Sage Weil <sage@newdream.net>
Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)
committer GitHub <noreply@github.com>
Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)
committer	GitHub <noreply@github.com>
	Sun, 23 Apr 2017 20:49:28 +0000 (15:49 -0500)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history