Commit Graph

5060 Commits

Author SHA1 Message Date
Mark Peek 768ca5e7b5 Merge branch 'master' of https://github.com/Cbeck527/packer 2015-10-18 14:33:55 -07:00
Mark Peek d453ce7607 Merge branch 'Sheile-use-default-volumesize' 2015-10-18 13:05:42 -07:00
Mark Peek 6f5c64db41 Merge branch 'use-default-volumesize' 2015-10-18 13:04:41 -07:00
Mark Peek a9716a4dc7 Merge pull request #2797 from jen20/improve-aws-instance-builder-error
Add suggestion to AWS Instance builder error message
2015-10-18 12:14:03 -07:00
Rickard von Essen 40355c1d40 Merge pull request #2839 from rickard-von-essen/issue-2836
Fixes #2836 - Use "/Applications/Parallels Desktop.app" as fallback…
2015-10-18 20:48:18 +02:00
Mark Peek 135a607fb4 Merge pull request #2745 from jessehub/master
documentation - indent ami_block_device_mappings keys
2015-10-18 11:44:47 -07:00
Mark Peek fc39f07ecc Add EbsOptimized to RequestSpotInstances (#2806) 2015-10-18 11:39:36 -07:00
Mark Peek edda3de677 Merge pull request #2806 from abridgett/feature/add_ebs_optimized_support
Add ebs_optimized support
2015-10-18 11:31:50 -07:00
Mark Peek c48548b3bb go fmt 2015-10-18 11:13:09 -07:00
Mark Peek f6c7e3740f Don't create EBS block device if VirtualName is specified 2015-10-18 11:05:21 -07:00
Mark Peek 914e78f602 builder/amazon/common: go fmt 2015-10-18 11:00:05 -07:00
Mark Peek 581c3574f6 Merge pull request #2672 from lightpriest/b-aws-ebs-block-device
Fix and refactor block device mapping builder
2015-10-18 10:56:53 -07:00
Rickard von Essen 4015c1789b Fixes #2836 - Use "/Applications/Parallels Desktop.app" as fallback app path. 2015-10-16 19:57:39 +02:00
Chris Bednarski 82a7f6ef97 Merge pull request #2835 from mitchellh/sethvargo/revert
Revert "Merge pull request #2807 from markpeek/markpeek-docker-tmpdir"
2015-10-15 12:42:33 -07:00
Seth Vargo e863dbe100 Revert "Merge pull request #2807 from markpeek/markpeek-docker-tmpdir"
This reverts commit 31d3678814, reversing
changes made to a3a7c974d0.
2015-10-15 14:31:13 -04:00
Mark Peek 22b7351489 Merge pull request #2804 from zyegfryed/patch-2
Fix ansible inventory example
2015-10-15 11:24:23 -07:00
Mark Peek 740de792e0 Merge pull request #2833 from mitchellh/test-logs
Log results of make test* to a file for easier review
2015-10-15 11:20:48 -07:00
Rickard von Essen 88386bc9db Merge pull request #2834 from rickard-von-essen/issue-2828
Fixes #2828: parallels prlctl_post don't interpolate values.
2015-10-15 09:38:13 +02:00
Rickard von Essen 141dcd5c03 Fixes #2828: parallels prlctl_post don't interpolate values. 2015-10-15 09:28:29 +02:00
Chris Bednarski b6bf2f899e Update makefile to tee test logs to a file so it's easier to review them after the run complete 2015-10-14 16:32:21 -07:00
Chris Bednarski 31f5721863 Ignore logs from packer tests 2015-10-14 16:31:43 -07:00
Mark Peek cad9899cfb communicator/winrm: call wg.Add() before running goroutine 2015-10-14 09:08:39 -07:00
Mark Peek e27b2bcf23 communicator/winrm: fix race in runCommand 2015-10-14 08:25:39 -07:00
Mark Peek af055ad3e0 Synchronize access to artifact map to remove race 2015-10-14 08:25:13 -07:00
Chris Bednarski d1f9a46c13 Merge pull request #2831 from kikitux/master
remove backquote from Makefile
2015-10-13 22:37:48 -07:00
Alvaro Miranda 04b33f902f Merge pull request #1 from kikitux/bf-backquotes-makefile
remove backquotes from Makefile
2015-10-14 17:54:26 +13:00
Alvaro Miranda 81f3296dd5 remove backquotes from Makefile
backquotes get evaluated in WARN message, replacing with simple quotes
2015-10-14 17:54:01 +13:00
Chris Bednarski a4eba1102b Switch bool chan to struct chan for less memory usage 2015-10-12 22:04:13 -07:00
Chris Bednarski 445595c6b5 Merge pull request #2825 from mitchellh/b-2793
Add explicit wait after Communicator.Download to make sure serveSingleCopy completes
2015-10-12 19:01:47 -07:00
Chris Bednarski 4856544027 Add a comment to indicate why we're waiting on the channel 2015-10-12 18:42:17 -07:00
Chris Bednarski b51cd5406a Add explicit wait after Communicator.Download to make sure serveSingleCopy completes 2015-10-12 18:12:22 -07:00
Chris Bednarski 4f59480adb Merge pull request #2812 from mitchellh/sethvargo/faster_deploy
Use a faster deploy script
2015-10-12 16:40:26 -07:00
Chris Bednarski f01956405b Merge pull request #2654 from mitchellh/b-xmlpath
Update dependency to an SSL-enabled path; this was migrated from launchpad to github
2015-10-12 16:39:35 -07:00
Eric Johnson 96d522fb64 Merge pull request #2811 from sparkprime/verbatim_account
account_file can be verbatim JSON string
2015-10-12 15:57:52 -07:00
Chris Bednarski 6e75a49f89 Merge pull request #2824 from mitchellh/b-ugorji
Switch from hashicorp/go-msgpack to the original upstream ugorgi/go to fix a slew of race conditions
2015-10-12 14:16:41 -07:00
Chris Bednarski 74d604e5a8 Switch from hashicorp/go-msgpack to the original upstream ugorgi/go to fix a slew of race conditions 2015-10-12 13:50:24 -07:00
Chris Bednarski ff6d448886 Merge pull request #2814 from mitchellh/b-2793-repro
Add a test case to validate download file size when downloading from docker
2015-10-12 13:38:52 -07:00
Mark Peek 1aad5cf6d5 provisioner/windows-restart: remove race in test 2015-10-12 13:20:18 -07:00
Mark Peek f401e765df Merge pull request #2822 from markpeek/markpeek-alt-rand
Initialize the random seeding in main and the RPC server (for plugins)
2015-10-12 13:17:28 -07:00
Mark Peek e5a713ff01 Alternative fix for #2641: make random script name actually random 2015-10-11 13:31:09 -07:00
Mark Peek 45829c30e5 builder/amazon/*: fix go vet 2015-10-11 12:18:23 -07:00
Mark Peek 268ce81dd3 helper/communicator: allow docker custom communicator 2015-10-11 11:48:16 -07:00
Mark Peek 2306f4a4e4 Fixes #2699: catch invalid communicator types 2015-10-11 11:20:50 -07:00
Mark Peek 44fd528645 Merge pull request #2819 from markpeek/markpeek-win-restart-sync
Syncronize cancellation in windows-restart tests
2015-10-11 11:14:26 -07:00
Mark Peek d87b68efe8 Syncronize cancellation in windows-restart tests
Two windows-restart tests would timeout and fail due to the cancellation
thread firing before the cancel object was created. This change syncronizes
the start of the threads to prevent this from occurring.
2015-10-10 14:32:39 -07:00
Chris Bednarski 5eddaa77bf Corrected sprintf formatting in error messages 2015-10-08 17:43:54 -07:00
Chris Bednarski cc153aa71f Added a test to verify byte size for larger files downloaded from docker 2015-10-08 17:15:27 -07:00
Chris Bednarski 8ff5c07d0c Add a new packer template for testing large file downloads 2015-10-08 16:37:14 -07:00
Mark Peek 23d5e50600 Merge pull request #2790 from dragon788/patch-1
Added correct format for compression_level
2015-10-08 15:33:44 -07:00
Chris Bednarski bd82df7aa1 Merge pull request #2712 from bensojona/f-document-artifact-types
Document recommended artifact-types
2015-10-08 14:34:17 -07:00