]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25998 into master
authorSage Weil <sage@redhat.com>
Fri, 18 Jan 2019 00:51:33 +0000 (18:51 -0600)
committerSage Weil <sage@redhat.com>
Fri, 18 Jan 2019 00:51:33 +0000 (18:51 -0600)
* refs/pull/25998/head:
msg/Dispatcher: remove force_new arg from ms_get_authorizer()
crimson/net: drop authenticator retry
msg/simple: remove forced authorizer refresh

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/mon/Monitor.cc
src/mon/Monitor.h

Simple merge
Simple merge