Mitchell Hashimoto 89ecb7850f Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options ... Conflicts: plugins/provisioners/ansible/provisioner.rb		2013-09-02 15:30:49 -07:00
..
config.rb	Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options	2013-09-02 15:30:49 -07:00
plugin.rb	Update 'require' calls to resemble shell provisioner	2013-04-04 00:07:30 -07:00
provisioner.rb	Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options	2013-09-02 15:30:49 -07:00