]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #26903 from xiexingguo/wip-ds-auth
authorXie Xingguo <xie.xingguo@zte.com.cn>
Sat, 16 Mar 2019 11:48:11 +0000 (19:48 +0800)
committerGitHub <noreply@github.com>
Sat, 16 Mar 2019 11:48:11 +0000 (19:48 +0800)
mgr/DaemonServer: handle caps more carefully

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

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