Merge tag '1.2.0' into develop

Giuseppe Morelli · Giuseppe Morelli · commit 422e56a52ca0 · 2017-11-27T18:46:03.000+01:00
1.2.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,12 @@
 
 Follow guideline of [Keep a Changelog](http://keepachangelog.com) from 1.11.5
 
-## [unreleased]
+## [1.2.0]
 
 ### Added
 - rsync folder: add possibility to choose user and group owner
 - possibility to add extra hard disk
+- add permament script path
 
 ### Changed
 - edit readme
diff --git a/config/config.yaml.sample b/config/config.yaml.sample
@@ -21,6 +21,7 @@ gmdotnet:
         ram: 1024
         cpu: 1
         extra_hard_disk:
+            create: yes
             filepath: .vagrant/extradisk.vdi
             size: 30 # size in GB
         # PROVISION
