Merge pull request #4726 from tchaikov/wip-11680-check-empty-crushmap

author Kefu Chai <tchaikov@gmail.com>

Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)
author Kefu Chai <tchaikov@gmail.com>
Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/test/mon/osd-crush.sh
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Fri, 12 Jun 2015 01:19:51 +0000 (09:19 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/mon/osd-crush.sh	patch \|	diff1 \|	diff2 \|	blob \| history