]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23984 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Sep 2018 22:35:55 +0000 (15:35 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 7 Sep 2018 22:35:55 +0000 (15:35 -0700)
* 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>

Trivial merge