Mitchell Hashimoto caa4fce2d3 Merge branch 'fix-minion-config-with-non-tmp-dir' of https://github.com/rach/packer into rach-fix-minion-config-with-non-tmp-dir ...

Conflicts:
	provisioner/salt-masterless/provisioner.go

2013-08-27 20:21:02 -07:00

..

provisioner_test.go

Add doc and change pillar tree in roots to respect salt vocabulary

2013-08-28 01:01:37 +01:00

provisioner.go

Merge branch 'fix-minion-config-with-non-tmp-dir' of https://github.com/rach/packer into rach-fix-minion-config-with-non-tmp-dir

2013-08-27 20:21:02 -07:00