From: Sage Weil <sage@redhat.com>
Date: Mon, 26 Nov 2018 03:21:02 +0000 (-0600)
Subject: Merge PR #17526 into master
X-Git-Tag: v14.1.0~823
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=825930b79b025afd3113b2aebcf4f4429d898d9b;p=ceph-ci.git

Merge PR #17526 into master

* refs/pull/17526/head:
	qa/tasks/ceph_manager: avoid test_map_discontinuity stall with too few up osds

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
---

825930b79b025afd3113b2aebcf4f4429d898d9b