Revert "Factor out for readability."

This reverts commit 62151dca655bbba6c9b4496cfee2572003947727.

2 files changed, 5 insertions, 5 deletions

diff --git a/bootstrap.sh b/bootstrap.sh
index 35c54f1166f..3ff9a62d3cf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,7 +26,7 @@ else
 fi
 
 mvn_install() {
-    mvn -e -X --quiet --batch-mode --threads 1.5C --no-snapshot-updates install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true "$@"
+    mvn --quiet --batch-mode --threads 1.5C --no-snapshot-updates install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true "$@"
 }
 
 # Generate vtag map
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 41f22f22c80..aa7688570ff 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -4,8 +4,8 @@
 # For a complete reference, please see the online documentation at https://docs.vagrantup.com.
 Vagrant.configure("2") do |config|
 
-  config.vm.box = "centos7-desktop"
-  config.vm.box_url = "/Users/balder/vagrant/centos7-desktop-17.0915.1.box"
+  config.vm.box = "TODO"
+  config.vm.box_url = "TODO"
 
   config.ssh.forward_agent = true
 
@@ -16,8 +16,8 @@ Vagrant.configure("2") do |config|
     vb.gui = true
     vb.name = "vespa-dev"
 
-    vb.memory = "10240"
-    vb.cpus = 8
+    vb.memory = "8192"
+    vb.cpus = 4
   end
   
   # Install required and nice-to-have packages