Commit 30eb92fd authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'vagrant-min-memory' into 'master'

Increase min memory of vagrant to 3GB to fix out-of-memory errors on dev:setup

The command `~/gitlab-development-kit/gitlab$ bundle exec rake dev:setup`
fails with an out of memory error. Increase the min memory configured in
the Vagrant virtual machine from 2GB to 3GB.

addresses #48

See merge request !66
parents 4014dd7e 95e08347
......@@ -122,8 +122,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
enable_shares(override, enable_nfs)
# use 1/4 of memory or 2 GB, whichever is greatest
mem = [mem / 4, 2048].max
# use 1/4 of memory or 3 GB, whichever is greatest
mem = [mem / 4, 3072].max
# performance tweaks
# per set cpus to real cores, not hyperthreads
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment