From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Feb 2019 13:14:33 +0000 (-0600)
Subject: Merge PR #26550 into master
X-Git-Tag: v14.1.0~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be257763f9907a867dd439aa82e63e81eff62039;p=ceph.git

Merge PR #26550 into master

* 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>
---

be257763f9907a867dd439aa82e63e81eff62039