Merge commit 'f4d0e740c024134af7a468282f47acd4175b0d0e' into nextRelease

This commit is contained in:
Henrik Rusche 2014-06-01 18:26:45 +02:00
commit 6618e8483a

View file

@ -4,7 +4,7 @@
Vagrant.configure("2") do |config|
config.vm.synced_folder "..", "/FOAM-sources"
config.vm.hostname="vagrant_"+ (ENV["HOSTNAME"] || `hostname`.strip)
config.vm.hostname="vagrant"+ (ENV["HOSTNAME"] || `hostname`.strip)
nrCPU=1
if ENV["WM_VAGRANT_CPUS"]