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>

diff --cc .githubmap
index 295b2d0995f60142624ca33dec89819231e68c05,295b2d0995f60142624ca33dec89819231e68c05..516557a7db2a86ea63f9ca1eff60f9f92dd30113
--- 1/.githubmap
--- 2/.githubmap
+++ b/.githubmap
@@@ -91,3 -91,3 +91,4 @@@ noahdesu Noah Watkins <nwatkins@redhat.
  tserong Tim Serong <tserong@suse.com>
  hsiang41 Rick Chen <rick.chen@prophetstor.com>
  djgalloway David Galloway <dgallowa@redhat.com>
++Yan-waller yanjun <yan.jun8@zte.com.cn>

diff --cc src/common/options.cc
Simple merge

diff --cc src/mds/MDSDaemon.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge