]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae2cc14 6f12cd3)
Merge PR #40870 into master
authorSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 12:14:28 +0000 (08:14 -0400)
committerSage Weil <sage@newdream.net>
Fri, 16 Apr 2021 12:14:28 +0000 (08:14 -0400)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.