From: Sage Weil Date: Thu, 12 Dec 2019 02:30:53 +0000 (-0600) Subject: Merge PR #32193 into master X-Git-Tag: v15.1.0~544 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cdad3d200189896ac6dbae96107a1eaeda70f5b5;p=ceph-ci.git Merge PR #32193 into master * refs/pull/32193/head: qa/tasks/ceph2 -> cephadm mgr/ssh -> mgr/cephadm mgr/ssh,cephadm: ceph-daemon -> cephadm doc/bootstrap: ceph-daemon -> cephadm ceph-daemon-adoption-corpus -> cephadm-adoption-corpus qa: rename ceph-daemon tests -> cephadm qa/tasks: ceph-daemon -> cephadm throughput var names and comments mgr/ssh,qa/tasks/ceph2: fix mode to be cephadm-package (vs root) mgr/ssh: rename option ceph_daemon_path -> cephadm_path files,rpm,deb: rename ceph-daemon -> cephadm Reviewed-by: Michael Fritch Reviewed-by: Sebastian Wagner --- cdad3d200189896ac6dbae96107a1eaeda70f5b5