Merge pull request #3522 from ceph/wip-8600

author Sage Weil <sage@redhat.com>

Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)

committer Sage Weil <sage@redhat.com>

Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)
author Sage Weil <sage@redhat.com>
Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)
committer Sage Weil <sage@redhat.com>
Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)
committer	Sage Weil <sage@redhat.com>
	Thu, 12 Feb 2015 02:31:42 +0000 (18:31 -0800)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history