Commit Graph
18348 Commits
Author SHA1 Message Date
Seth Vargo a637556803 Merge pull request #1727 from timurb/add-verify_peer
added ssl_verify_mode parameter to chef-client provisioner
2014-12-08 11:22:40 -08:00
Armon Dadgar 2dace054bf Merge pull request #1707 from gergnz/master
change ordering of ssh connection IP for amazon. fixes #1559
2014-12-08 11:17:09 -08:00
Armon Dadgar dd5de1e342 Merge pull request #1692 from nitrous-io/digitalocean-image-id
Use DigitalOcean image ID for artifact Id()
2014-12-08 11:16:08 -08:00
Armon Dadgar fdeb2bc8a2 Merge pull request #1694 from ceh/issue-1125
Test for user variables in vagrantfile_template [GH-1125]
2014-12-08 11:15:12 -08:00
Armon Dadgar 183d4a8474 Merge pull request #1700 from legal90/iss-1667
Parallels: Fixed issue #1667
2014-12-08 11:13:44 -08:00
Armon Dadgar 6916b486ed Merge pull request #1704 from mattr-/new-amazon-ami-in-docs
Update the getting started docs with Amazon changes
2014-12-08 11:12:23 -08:00
Godefroid Chapelle 5a892560c3 Merge remote-tracking branch 'origin/master' into patch-1 2014-12-06 00:49:50 +01:00
Matt Rogers df48ec3356 Use a newer source AMI
The AMI that was previously listed before this change no longer exists.
2014-12-05 16:22:14 -06:00
Matt Rogers 44a2ceb3d8 Use the latest micro instance from the free tier 2014-12-05 16:22:14 -06:00
Timur Batyrshin e4c544b3e2 added ssl_verify_mode parameter to chef-client provisioner 2014-12-05 20:26:41 +03:00
Seth Vargo 53d531fad4 Merge pull request #1725 from dragon788/master
Fixed typo
2014-12-05 12:00:27 -05:00
dragon788 582b8a6ad9 Fixed typo 2014-12-05 10:55:27 -06:00
James Sinclair 02ebef9031 Use an index loop as range loops over copies, not references
Fixes #1637
2014-12-05 17:27:00 +11:00
Eric Johnson e7f274325e Merge pull request #1706 from rsdy/master
fix googlecompute oauth dependency
2014-12-03 06:29:52 -08:00
Godefroid Chapelle 955122f2e1 Be more explicit about escaping alias 2014-12-02 15:07:29 +01:00
Godefroid Chapelle 075abfeeae Escapes cp alias
Fix for #1656
2014-12-02 14:58:13 +01:00
Greg Cockburn dbaf865e59 change ordering of ssh connection IP for amazon. fixes #1559 2014-12-01 10:44:52 +11:00
rhapsodhy dd547af0c4 fix googlecompute oauth dependency 2014-11-30 04:15:44 +00:00
Seth Vargo e5c0bf14df Merge pull request #1698 from jmassara/chef_client_prevent_sudo
Use sudo only if prevent_sudo is not set
2014-11-27 11:05:31 -05:00
James Massara d5f49777e9 Merging upstream changes 2014-11-27 06:35:06 -08:00
James Massara 1837c7189a Added tests for prevent_sudo 2014-11-27 06:24:54 -08:00
James Massara a5ca2e5a27 Use sudo only if prevent_sudo is not set 2014-11-27 06:24:54 -08:00
Mikhail Zholobov a5b21c59ba builder/parallels: Move setting the boot order to the separated step 2014-11-27 17:13:50 +03:00
Mikhail Zholobov 05affceaef builder/parallels: Attach bootable ISO exactly to cdrom0 [GH-1667] 2014-11-27 17:11:16 +03:00
James Massara c6db28d511 Added tests for prevent_sudo 2014-11-26 15:13:09 -08:00
Seth Vargo 347f02a7f2 Merge pull request #1402 from jasonberanek/858-issue
fix build name ConfigTemplate processing [GH-858]
2014-11-26 16:30:36 -05:00
Seth Vargo 0eb634ae6a Merge pull request #1525 from scott2449/master
Add default nodename for chef-client
2014-11-26 16:29:22 -05:00
Seth Vargo 1954cc9758 Merge pull request #1628 from israelshirk/hotfix/docker-communicator-symlink
Fixes Docker communicator mishandling of symlinks in UploadDir()
2014-11-26 16:28:41 -05:00
Seth Vargo 96c813684e Merge pull request #1645 from vtolstov/qemu_disk
Allow none checksumtype for qemu builder
2014-11-26 16:28:19 -05:00
Seth Vargo a60039e720 Merge pull request #1650 from vtolstov/digitalocean
fix digitalocean v2 api content-type when using json
2014-11-26 16:25:19 -05:00