Merge pull request #5252 from ceph/wip-12021-hammer

author Sage Weil <sage@redhat.com>

Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)
author Sage Weil <sage@redhat.com>
Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 16 Jul 2015 15:04:52 +0000 (11:04 -0400)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history