Mitchell Hashimoto da1de12b78 Merge branch 'provisioner-chef-solo' of https://github.com/jvandyke/packer into jvandyke-provisioner-chef-solo ... Conflicts: config.go		2013-08-25 20:49:53 -07:00
..
chef-solo	Remove debugging statement.	2013-07-15 16:38:26 -04:00
file	communicator/ssh: UploadDir works properly	2013-08-25 20:30:56 -07:00
salt-masterless	provisioner/salt-masterless: fix the build	2013-08-23 15:58:30 -07:00
shell	provisioner/shell: retry the upload if command fails as well	2013-08-23 11:21:20 -07:00