Commiting a stable havana Puppetfile
Upgradeing to ICEHOUSE modules
Merge remote-tracking branch 'upstream/openstack' into openstack (note upstream = github/huit/vagrant-generic)