From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Dec 2018 23:01:04 +0000 (-0600)
Subject: Merge PR #25236 into master
X-Git-Tag: v14.1.0~573
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb804eb895315a03d60d78595f652720062e9a4d;p=ceph.git

Merge PR #25236 into master

* refs/pull/25236/head:
	ceph-volume: Add venv to vstart cmake target
	mgr/orchestrator: Add test orchestrator

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

bb804eb895315a03d60d78595f652720062e9a4d