6 commits

Author	SHA1	Message	Date
Anders Ingemann	a241842ef9	Better dict merging (less side-effectful)	2015-04-16 22:18:58 +02:00
Anders Ingemann	8bb34c604b	Fix serious bug in merge_dicts where the original dict would be modified	2015-04-16 22:18:57 +02:00
Anders Ingemann	9c6af89e78	Abstract bootstrapping, instance creation, booting etc.. ... This all now runs using a simple with: statement	2015-04-16 22:18:57 +02:00
Anders Ingemann	ad52df37bd	Add partial for config of root password	2015-04-16 22:15:20 +02:00
Anders Ingemann	71e0d943fc	Make json and yaml files conflict instead of override	2015-04-16 22:15:20 +02:00
Anders Ingemann	86afbaf929	Clean up integration testing	2015-04-16 22:15:18 +02:00