Mitchell Hashimoto 349b2507f9 Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell ...

Conflicts:
	plugins/provisioners/shell/config.rb
	plugins/provisioners/shell/provisioner.rb

2013-08-28 22:29:49 -07:00

..

config.rb

Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell

2013-08-28 22:29:49 -07:00

plugin.rb

New provisioner API. Shell provisioner adheres to it.

2013-01-13 15:48:52 -08:00

provisioner.rb

Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell

2013-08-28 22:29:49 -07:00