]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12563 from xiexingguo/xxg-wip-osd-1217
authorSage Weil <sage@redhat.com>
Sat, 24 Dec 2016 04:54:14 +0000 (22:54 -0600)
committerGitHub <noreply@github.com>
Sat, 24 Dec 2016 04:54:14 +0000 (22:54 -0600)
common: make attempts of auth rotating configurable

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/common/config_opts.h
src/mds/MDSDaemon.cc
src/osd/OSD.cc
src/osd/OSDMap.cc

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