Commit Graph

8443 Commits

Author SHA1 Message Date
Mitchell Hashimoto 7345c67b98 Merge pull request #6160 from lonniev/lonniev_rsync_issue_6115_branch
Scrub Guest Paths for Windows Rsync leaving Dirty Paths for Winrm Mkdir
2015-11-18 12:10:09 -08:00
Mitchell Hashimoto 4ccf83de44 Merge pull request #6172 from glensc/pld/networking
fix network detection on pld-linux
2015-11-18 12:08:53 -08:00
Mitchell Hashimoto 86083c2546 Merge pull request #6157 from justincampbell/www-add-boxes-to-nav
website/www: Add Atlas box search to nav
2015-11-18 12:06:13 -08:00
Mitchell Hashimoto aabe5975d4 Merge pull request #6156 from justincampbell/www-fix-footer-alignment
website/www: Fix logos/copyright alignment
2015-11-18 12:06:01 -08:00
Mitchell Hashimoto fbd8c370ad update CHANGELOG 2015-11-18 12:05:41 -08:00
Mitchell Hashimoto 8886a20d34 Merge pull request #6150 from pwnall/patch-2
Don't warn about an .1 IP for DHCP networks
2015-11-18 12:04:52 -08:00
Mitchell Hashimoto 40e0ba9560 Merge pull request #6149 from pwnall/patch-1
The docs typo'd the nic_type parameter
2015-11-18 12:03:30 -08:00
Mitchell Hashimoto 21d73ae811 Merge branch 'apertoso-master' 2015-11-18 12:00:36 -08:00
Mitchell Hashimoto aa0f57f7b7 Merge branch 'master' of https://github.com/apertoso/vagrant into apertoso-master 2015-11-18 12:00:12 -08:00
Mitchell Hashimoto fedc7e21b3 provisioners/salt: deprecate config_dir 2015-11-18 11:56:07 -08:00
Mitchell Hashimoto 6c250d023e Merge pull request #6073 from johntron/revert-74d22069
Stop trying to upload minion config to privileged directory
2015-11-18 11:52:06 -08:00
Mitchell Hashimoto 32a0d5f984 Merge pull request #6071 from caseylang/patch-1
website/docs: Clarify config.ssh.insert_key docs
2015-11-18 11:45:30 -08:00
Mitchell Hashimoto ab1c0a889c Merge pull request #6050 from benh57/fix_environment_error
Fix string parse error in the environment path missing error message.
2015-11-18 11:40:41 -08:00
Mitchell Hashimoto 9730df3b78 update CHANGELOG 2015-11-18 11:39:45 -08:00
Mitchell Hashimoto 6639d56c9c Merge pull request #5999 from PatOShea/patch-4
Correct salt-minion and call ext on windows guest
2015-11-18 11:39:09 -08:00
Mitchell Hashimoto 6db0e0ddfb update CHANGELOG 2015-11-18 11:32:38 -08:00
Mitchell Hashimoto 7f25d49e81 Merge pull request #5991 from Mattias-/fix-puppet-environment-manifest
Fix puppet apply environment default manifest
2015-11-18 11:31:54 -08:00
Mitchell Hashimoto d83d614331 Merge pull request #5993 from PatOShea/patch-2
website/docs: Corrected masterless example for salt provisioner in documentation
2015-11-18 11:28:57 -08:00
Mitchell Hashimoto 4e7aa4cc3c update CHANGELOG 2015-11-18 11:23:23 -08:00
Mitchell Hashimoto 82f968fe44 website/docs: update for new plugin flag 2015-11-18 11:22:42 -08:00
Mitchell Hashimoto 3d6b11375a commands/plugin: plugin-clean-sources 2015-11-18 11:21:39 -08:00
Mitchell Hashimoto 946d2fe154 Merge pull request #4738 from robkinyon/skip_default_sources
Added a --plugin-clean-sources parameter
2015-11-18 11:20:34 -08:00
Austin Schutz 96e4544949 use env.ui for action logging 2015-11-18 11:15:02 -08:00
Austin Schutz 566e21d3fc add machine readable logging, action starts/ends 2015-11-18 11:15:02 -08:00
Seth Vargo edffb130c3 Update CHANGELOG 2015-11-18 11:08:32 -08:00
Mitchell Hashimoto b916be4d74 update CHANGELGO 2015-11-18 11:06:09 -08:00
Mitchell Hashimoto f1827602f2 Merge pull request #6502 from dmacvicar/fix-dhcp-on-suse
SUSE-flavored systems use STARTMODE and not ONBOOT
2015-11-18 11:05:36 -08:00
Mitchell Hashimoto d1baffe064 update CHANGELOG 2015-11-18 11:03:16 -08:00
Mitchell Hashimoto d0ad747914 Merge pull request #5986 from denisbr/master
Specify time and don't do -h -H which is not really a valid usage.
2015-11-18 11:02:43 -08:00
Mitchell Hashimoto 495af24026 update CHANGELOG 2015-11-18 11:01:20 -08:00
Mitchell Hashimoto b69d635f75 commands/up: use sets 2015-11-18 10:59:29 -08:00
Seth Vargo d7f296175e Update CHANGELOG 2015-11-18 10:54:34 -08:00
Mitchell Hashimoto fdd3b5c7ec Merge pull request #5981 from jkburges/named_provision_with
Allow provisioner instance names to be specified for `up` and `reload…
2015-11-18 10:54:22 -08:00
Seth Vargo 176b38880d Merge pull request #6534 from mitchellh/sethvargo/less_access_token
Only append access_token the first time
2015-11-18 10:53:34 -08:00
Mitchell Hashimoto 6bc286a70b website: update docs for powershell 2015-11-18 10:51:18 -08:00
Mitchell Hashimoto e34af86acf commands/powershell 2015-11-18 10:46:17 -08:00
Seth Vargo ff95fc5c1e Only append access_token the first time
This fixes GH-6395 by only appending the access_token once. It also fixes a
bug that was never reported. If a user supplied an access_token for a box URL,
Vagrant would silently overwrite it.

After this commit, Vagrant only appends an access_token to the URL if no
value exists at the key.
2015-11-18 10:44:35 -08:00
Mitchell Hashimoto 8bbf6f56f4 Merge pull request #4400 from mwrock/ps-cmd
Add a ps command to vagrant that drops the user into a remote powershell shell
2015-11-18 10:41:36 -08:00
Gilles Cornu 819c9b6425 provisioners/ansible_local: align console outputs
Use "info" level for main tasks (installing ansible, running galaxy,
running playbook).
Use "detail" level for subsequent details.
2015-11-18 09:37:27 +01:00
Gilles Cornu c1f3d114f5 provisioners/ansible(both): add galaxy support
Close #2718
2015-11-17 22:08:29 +01:00
Gilles Cornu b9738a8c4c provisioners/ansible: add missing unit test
Related to #5292
2015-11-17 22:08:18 +01:00
Gilles Cornu a0576349fe provisioners/ansible(both): reorganize i18n texts
These adaptations will make even more sense with the upcoming
introduction of `ansible-galaxy` support.
2015-11-17 22:08:18 +01:00
Jack Pearkes f24250ae9a Merge pull request #6527 from mitchellh/debian-logo
website: fix debian logo
2015-11-17 11:39:52 -08:00
Jack Pearkes cd08ab93a3 website: fix debian logo 2015-11-17 10:51:04 -08:00
Seth Vargo 988787dec6 Merge pull request #6525 from ReadmeCritic/master
Update README URLs based on HTTP redirects
2015-11-16 12:20:09 -05:00
ReadmeCritic 8c070df2b5 Update README URLs based on HTTP redirects 2015-11-16 09:15:58 -08:00
Thach Mai 3fe52bd170 Fix Vagrantfile for latest middleman 2015-11-15 22:30:24 +01:00
captainill ae0bc1872c noticed a few other whitespace issues 2015-11-14 17:18:30 -08:00
captainill 7d1aac6079 major whitespace cleanup! 2015-11-14 17:12:59 -08:00
captainill b61dae9142 responsive cleanup 2015-11-14 16:55:35 -08:00