Merge pull request #4602 from ceph/wip-11504

author Gregory Farnum <greg@gregs42.com>

Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)

committer Gregory Farnum <greg@gregs42.com>

Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)
author Gregory Farnum <greg@gregs42.com>
Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)
committer Gregory Farnum <greg@gregs42.com>
Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.h
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)
committer	Gregory Farnum <greg@gregs42.com>
	Fri, 5 Jun 2015 18:13:42 +0000 (11:13 -0700)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history