From: Tom Hughes Date: Mon, 21 Oct 2019 09:31:06 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2400' X-Git-Tag: live~2474 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3ece776664381794b5e342e82ed2be3f47f120b5?hp=24cf5809791f0bb1efcdf1c33b5221f76458adcf Merge remote-tracking branch 'upstream/pull/2400' --- diff --git a/VAGRANT.md b/VAGRANT.md index 9dea61861..ff4cb5737 100644 --- a/VAGRANT.md +++ b/VAGRANT.md @@ -10,8 +10,7 @@ Other Linux distributions should have similar installation instructions using `d Installers are available for Mac OS X and Windows, please see the [Vagrant project download page](https://www.vagrantup.com/downloads.html) for more information. -Note than until there are suitable _xenial64_ [vagrant boxes](https://atlas.hashicorp.com/boxes/search?utf8=%E2%9C%93&sort=&provider=&q=xenial64) for other providers, -the only virtualization provider supported is virtualbox. You might need to install it and specify `--provider virtualbox` when setting up your environment. +We currently support three Vagrant providers, namely `virtualbox`, `lxc` and `libvirt`. You might need to install one of these, for example virtualbox, and specify the provider, e.g. `--provider virtualbox`, when setting up your environment. # Setting up openstreetmap-website