From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 14 Jul 2020 09:04:14 +0000 (+0200)
Subject: Merge pull request #35988 from votdev/adapt_cephadm_vagrant
X-Git-Tag: v15.2.5~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60960d475ca56bf130fbbebb89d8d8c293073e85;p=ceph.git

Merge pull request #35988 from votdev/adapt_cephadm_vagrant

octopus: mgr/cephadm: Adapt Vagrantfile to use octopus instead of master repo on shaman

Reviewed-by: Stephan Müller <smueller@suse.com>
---

60960d475ca56bf130fbbebb89d8d8c293073e85