From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Mar 2016 22:27:40 +0000 (+0000)
Subject: Merge remote-tracking branch 'openstreetmap/pull/1120'
X-Git-Tag: live~3911
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/860887de5272c3e2a39cb7e0c9db6f0acba1b4c6?hp=fbf2b45ecc0380f9ff2198da706b85280543c5a0

Merge remote-tracking branch 'openstreetmap/pull/1120'
---

diff --git a/Vagrantfile b/Vagrantfile
index 24d62bb7a..0cd5ac72a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,9 +3,11 @@
 
 Vagrant.configure("2") do |config|
   # use official ubuntu image for virtualbox
-  config.vm.provider "virtualbox" do |_, override|
+  config.vm.provider "virtualbox" do |vb, override|
     override.vm.box = "ubuntu/trusty64"
     override.vm.synced_folder ".", "/srv/openstreetmap-website"
+    vb.customize ["modifyvm", :id, "--memory", "1024"]
+    vb.customize ["modifyvm", :id, "--cpus", "2"]
   end
 
   # use third party image and NFS sharing for lxc