]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
projects / ceph-ci.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a32d5b 3ce61e4)
Merge PR #25828 into master
authorSage Weil <sage@redhat.com>
Sat, 12 Jan 2019 11:45:45 +0000 (05:45 -0600)
committerSage Weil <sage@redhat.com>
Sat, 12 Jan 2019 11:45:46 +0000 (05:45 -0600)
commit646a468e12a35eead5a6187184e9a471ed0aa22a
treef2698d3ac17dd0162ace5945d076d770639fb856tree | snapshot
parent9a32d5ba1f7248a5196a89fa29a7b3044dd4d785commit | diff
parent3ce61e40fa7dfe21b8966879528bc76256a60118commit | diff
Merge PR #25828 into master

* refs/pull/25828/head:
osd, mgr, mds: make timeout of updating rotating keys configurable

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
.githubmap diff1 | diff2 | blob | history
src/common/options.cc diff1 | diff2 | blob | history
src/mds/MDSDaemon.cc diff1 | diff2 | blob | history
src/osd/OSD.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.