Mitchell Hashimoto 8445308830 Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts ...

Conflicts:
	plugins/provisioners/ansible/provisioner.rb

2013-08-28 16:52:13 -07:00

..

ansible

Merge branch 'generate_ansible_hosts' of https://github.com/commandtab/vagrant into commandtab-generate_ansible_hosts

2013-08-28 16:52:13 -07:00

cfengine

Don't forcibly output newlines for provisioners

2013-07-19 23:38:25 -04:00

chef

Merge branch 'chef_solo_environment_support' of https://github.com/marcparadise/vagrant into marcparadise-chef_solo_environment_support

2013-08-28 16:49:19 -07:00

puppet

Update CHANGELOG

2013-08-09 11:53:58 -07:00

shell

Don't forcibly output newlines for provisioners

2013-07-19 23:38:25 -04:00