]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #40603 into master
authorSage Weil <sage@newdream.net>
Tue, 6 Apr 2021 21:28:08 +0000 (17:28 -0400)
committerSage Weil <sage@newdream.net>
Tue, 6 Apr 2021 21:28:08 +0000 (17:28 -0400)
* refs/pull/40603/head:
qa/tasks/ceph.conf: shorten cephx TTL for testing

Reviewed-by: Ilya Dryomov <idryomov@redhat.com>

Trivial merge