]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25236 into master
authorSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 23:01:04 +0000 (17:01 -0600)
committerSage Weil <sage@redhat.com>
Thu, 20 Dec 2018 23:01:04 +0000 (17:01 -0600)
* refs/pull/25236/head:
ceph-volume: Add venv to vstart cmake target
mgr/orchestrator: Add test orchestrator

Reviewed-by: Jeff Layton <jlayton@redhat.com>

Trivial merge