]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27012 into master
authorSage Weil <sage@redhat.com>
Thu, 28 Mar 2019 16:21:01 +0000 (11:21 -0500)
committerSage Weil <sage@redhat.com>
Thu, 28 Mar 2019 16:21:01 +0000 (11:21 -0500)
* refs/pull/27012/head:
common/options: allow (but to not prefer or require) secure mode
common/options: make clients prefer to connect to mons via secure mode
common/options: allow connections to mons in secure mode
common/options: prefer secure mode between monitors
auth/AuthRegistry: remove experimental flag for 'secure' mode

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/common/options.cc

Simple merge