]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32886 into master
authorSage Weil <sage@redhat.com>
Mon, 27 Jan 2020 17:31:36 +0000 (11:31 -0600)
committerSage Weil <sage@redhat.com>
Mon, 27 Jan 2020 17:31:36 +0000 (11:31 -0600)
* refs/pull/32886/head:
cephadm: no --no-systemd arg to ceph-volume deactivate

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm

Simple merge