]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26550 into master
authorSage Weil <sage@redhat.com>
Fri, 22 Feb 2019 13:14:33 +0000 (07:14 -0600)
committerSage Weil <sage@redhat.com>
Fri, 22 Feb 2019 13:14:33 +0000 (07:14 -0600)
* refs/pull/26550/head:
mon/AuthMonitor: provide auth_lock-safe _assign_global_id()
mon/AuthMonitor: provide AuthMonitor with mon count and rank *only* while active

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

Trivial merge