]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33131 into master
authorSage Weil <sage@redhat.com>
Mon, 10 Feb 2020 18:17:45 +0000 (12:17 -0600)
committerSage Weil <sage@redhat.com>
Mon, 10 Feb 2020 18:17:45 +0000 (12:17 -0600)
* refs/pull/33131/head:
mgr/orch: 'ceph orchestrator ...' -> 'ceph orch ...'

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/cephadm/cephadm

Simple merge