]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #32981 into master
authorSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 03:56:18 +0000 (21:56 -0600)
committerSage Weil <sage@redhat.com>
Fri, 31 Jan 2020 03:56:18 +0000 (21:56 -0600)
* 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>

Trivial merge