From: Patrick Donnelly <pdonnell@redhat.com>
Date: Fri, 7 Sep 2018 22:35:55 +0000 (-0700)
Subject: Merge PR #23984 into master
X-Git-Tag: v14.0.1~370
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17f79b0745e4587aeb55be611e79e513154643ce;p=ceph.git

Merge PR #23984 into master

* refs/pull/23984/head:
	mon: test if gid exists in pending for prepare_beacon

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

17f79b0745e4587aeb55be611e79e513154643ce