Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fix AWS provisioning with Vagrant #192

Merged
merged 6 commits into from Mar 27, 2013
Commits on Mar 26, 2013
Commits on Mar 27, 2013
  1. Merge remote-tracking branch 'upstream/master' into vagrant11-providers

    Charles Hooper committed Mar 27, 2013
    Conflicts:
    	puppet/modules/docker/manifests/init.pp
  2. Remove duplicate user definition

    Charles Hooper committed Mar 27, 2013
  3. Stop using custom AMI and use standard Ubuntu AMI

    Charles Hooper committed Mar 27, 2013