Merge pull request #3743 from trociny/wip-osd_create

author Kefu Chai <tchaikov@gmail.com>

Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)
author Kefu Chai <tchaikov@gmail.com>
Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Thu, 7 May 2015 16:13:37 +0000 (00:13 +0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history