From: Kefu Chai Date: Mon, 22 Aug 2016 14:44:56 +0000 (+0800) Subject: Merge pull request #10800 from ceph/wip-postfile-rsa X-Git-Tag: v11.0.1~416 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a23c2ed71fe25cc66bdfa26746269f93f10253f;p=ceph.git Merge pull request #10800 from ceph/wip-postfile-rsa ceph-post-file replace DSA with RSA ssh key Reviewed-by: Kefu Chai --- 1a23c2ed71fe25cc66bdfa26746269f93f10253f diff --cc debian/ceph-common.install index 2315d5c65359,361d878fe9a3..9565372cb166 --- a/debian/ceph-common.install +++ b/debian/ceph-common.install @@@ -31,9 -31,10 +31,9 @@@ usr/share/man/man8/rbd. usr/share/man/man8/rbdmap.8 usr/share/man/man8/rbd-replay*.8 usr/share/ceph/known_hosts_drop.ceph.com - usr/share/ceph/id_dsa_drop.ceph.com - usr/share/ceph/id_dsa_drop.ceph.com.pub + usr/share/ceph/id_rsa_drop.ceph.com + usr/share/ceph/id_rsa_drop.ceph.com.pub etc/ceph/rbdmap -etc/init.d/rbdmap lib/udev/rules.d/50-rbd.rules usr/lib/python*/dist-packages/ceph_argparse.py* usr/lib/python*/dist-packages/ceph_daemon.py*