]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #26568 into master
authorSage Weil <sage@redhat.com>
Fri, 22 Feb 2019 13:10:32 +0000 (07:10 -0600)
committerSage Weil <sage@redhat.com>
Fri, 22 Feb 2019 13:10:32 +0000 (07:10 -0600)
* refs/pull/26568/head:
unittest_auth: add unit tests for AuthRegistry con_mode selection
auth/AuthRegistry: register as an observer
auth/AuthRegistry: clear output vectors
common/options: add ms_mon_client_mode
auth: push con_mode selection into AuthRegistry helper

Reviewed-by: Ricardo Dias <rdias@suse.com>
1  2 
src/msg/async/ProtocolV2.cc
src/test/CMakeLists.txt

Simple merge
Simple merge