]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 478b212 dd573aa)
Merge PR #26637 into master
authorSage Weil <sage@redhat.com>
Wed, 27 Feb 2019 22:59:32 +0000 (16:59 -0600)
committerSage Weil <sage@redhat.com>
Wed, 27 Feb 2019 22:59:32 +0000 (16:59 -0600)
* refs/pull/26637/head:
common/ceph_context: experimental kludge for crimson
auth/AuthRegistry: mark 'secure' con mode experimental for now
msg/async: set ms_*_mode to crc only (no secure)

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.