]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29513 into nautilus
authorSage Weil <sage@redhat.com>
Wed, 7 Aug 2019 18:25:12 +0000 (13:25 -0500)
committerSage Weil <sage@redhat.com>
Wed, 7 Aug 2019 18:25:12 +0000 (13:25 -0500)
* refs/pull/29513/head:
qa/tasks/ceph_deploy: assume systemd and simplify shutdown wonkiness
qa/tasks/ceph_deploy: do not rely on ceph-create-keys

Reviewed-by: Vasu Kulkarni <vasu@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>

Trivial merge