Merge pull request #8384 from songbaisen/song18

author Sage Weil <sage@redhat.com>

Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)
author Sage Weil <sage@redhat.com>
Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/test/mon/osd-crush.sh
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 23 Apr 2016 00:20:29 +0000 (20:20 -0400)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/mon/osd-crush.sh	patch \|	diff1 \|	diff2 \|	blob \| history