From: Sage Weil <sage@redhat.com>
Date: Fri, 31 Jan 2020 03:56:18 +0000 (-0600)
Subject: Merge PR #32981 into master
X-Git-Tag: v15.1.1~596
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d2e5961ac9ff205585192a8179544f9b8c6c0027;p=ceph-ci.git

Merge PR #32981 into master

* refs/pull/32981/head:
	mon: elector: return after triggering a new election

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

d2e5961ac9ff205585192a8179544f9b8c6c0027