Merge branch 'master' into release

vccw-team · Jan 7, 2016 · ed25c0c · ed25c0c
2 parents 9659be2 + 46ef326
commit ed25c0c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -3,7 +3,7 @@
 
 require 'yaml'
 
-Vagrant.require_version '>= 1.5'
+Vagrant.require_version '>= 1.8'
 
 Vagrant.configure(2) do |config|
 
@@ -64,10 +64,11 @@ Vagrant.configure(2) do |config|
   end
 
   if Vagrant.has_plugin?('vagrant-vbguest')
-    config.vbguest.auto_update = false
+    config.vbguest.auto_update = true
   end
 
   config.vm.provider :virtualbox do |vb|
+    vb.linked_clone = _conf['linked_clone']
     vb.name = _conf['hostname']
     vb.memory = _conf['memory'].to_i
     vb.cpus = _conf['cpus'].to_i
@@ -109,7 +110,8 @@ Vagrant.configure(2) do |config|
             'mbstring.internal_encoding' => 'UTF-8',
             'date.timezone'              => 'UTC',
             'short_open_tag'             => 'Off',
-            'session.save_path'          => '/tmp'
+            'session.save_path'          => '/tmp',
+            'upload_max_filesize'        => '32M'
         }
       },
       :mysql => {

diff --git a/provision/default.yml b/provision/default.yml
@@ -106,3 +106,8 @@ group: vagrant
 # phpenv
 #
 php_version: default
+
+#
+# Linked Clone for Vagrant v1.8
+#
+linked_clone: false