From: Sage Weil <sage@newdream.net>
Date: Fri, 16 Apr 2021 12:14:28 +0000 (-0400)
Subject: Merge PR #40870 into master
X-Git-Tag: v17.1.0~2229
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cfc002cb707aa855ecca33bb89436f990d902cd;p=ceph.git

Merge PR #40870 into master

* refs/pull/40870/head:
	auth/cephx: make KeyServer::build_session_auth_info() less confusing
	auth/cephx: cap ticket validity by expiration of "next" key
	auth/cephx: drop redundant KeyServerData::get_service_secret() overload

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

4cfc002cb707aa855ecca33bb89436f990d902cd