Mitchell Hashimoto 88c186df39 Merge branch 'master' of github.com:matthbak/packer into matthbak-master ... Conflicts: builder/qemu/step_run.go		2014-09-02 09:24:31 -07:00
..
amazon	Merge pull request #1425 from dysinger/1424-amazon-instance-s3-region-not-url	2014-09-01 21:31:36 -07:00
digitalocean	fix missing parts	2014-08-28 22:24:31 +04:00
docker	website: add docs for docker-import and docker-push	2014-01-19 20:42:42 -08:00
googlecompute	Allow specifying project for source images in GCE	2014-08-20 10:20:28 -07:00
null	null-builder: added support for templating	2014-07-17 17:46:22 +02:00
openstack	Merge pull request #1410 from msabramo/openstack_builder_blank_keypair_is_error	2014-09-01 21:44:41 -07:00
parallels	builder/parallels: "guest_os_distribution" renamed to "guest_os_type".	2014-09-02 18:14:50 +04:00
qemu	Merge branch 'master' of github.com:matthbak/packer into matthbak-master	2014-09-02 09:24:31 -07:00
virtualbox	Accept VirtualBox release candidate version (ex. 4.3.14_RC1 from 4.3.14_RC1r94870)	2014-07-12 19:08:10 +09:00
vmware	Merge pull request #1396 from ianunruh/feature/vmware-ssh-host-template	2014-09-02 09:19:50 -07:00