Commit Graph

8118 Commits

Author SHA1 Message Date
Mitchell Hashimoto d657804f18 Merge branch 'master' of https://github.com/matthewcodes/vagrant into matthewcodes-master 2015-11-18 15:09:47 -08:00
Mitchell Hashimoto 3da746feac update CHANGELOG 2015-11-18 15:01:09 -08:00
Mitchell Hashimoto f5f596ab8b Merge pull request #6389 from grafjo/fix_6151
Fix for #6151 / provisioner puppet_server with Puppet Collection 1
2015-11-18 14:59:58 -08:00
Seth Vargo f3bcadc00b Merge pull request #6521 from thachmai/master
Fix Vagrantfile for latest middleman
2015-11-18 14:48:02 -08:00
Mitchell Hashimoto cccdb87388 Merge pull request #6407 from josephfrazier/patch-1
handle_forwarded_port_collisions.rb: fix typo: "Reparied" -> "Repaired"
2015-11-18 14:38:03 -08:00
Mitchell Hashimoto c7a8edd05a update CHANGELOG 2015-11-18 14:37:17 -08:00
Mitchell Hashimoto d69d7047b2 Merge pull request #6386 from legal90/fix-osx-nic-order
Fix network configuration in OS X (Darwin) guests
2015-11-18 14:33:51 -08:00
Mitchell Hashimoto ba3100f836 Merge pull request #6383 from PatOShea/patch-5
Document windows minion requirement for ipc_mode
2015-11-18 14:20:16 -08:00
Mitchell Hashimoto 28f8db6e73 update CHANGELOG 2015-11-18 14:18:28 -08:00
Mitchell Hashimoto d89bd56d27 Merge pull request #6373 from caleblloyd/patch-1
Hyper-V: select boot device by VM generation
2015-11-18 14:16:54 -08:00
Seth Vargo 47e42940ea Merge pull request #6444 from glamouracademy/master
Add links for OS links in Readme
2015-11-18 14:04:55 -08:00
Seth Vargo 50ce81face Update CHANGELOG 2015-11-18 14:03:35 -08:00
Seth Vargo 72d62e3d2e Merge pull request #6404 from timotei/patch-1
Remove back tick in puppet facts definitions #6403 (Fix vagrant 1.7.3+ with puppet)
2015-11-18 14:02:48 -08:00
Mitchell Hashimoto fb11ea2a7c update CHANGELOG 2015-11-18 14:02:32 -08:00
Mitchell Hashimoto fe36131549 Merge pull request #6367 from knixeur/fix-host-slackware
Fix Slackware Host detection and nfsd checks
2015-11-18 14:02:06 -08:00
Seth Vargo d680811d01 Merge pull request #6364 from ctammes/patch-1
Update push.rb
2015-11-18 14:01:16 -08:00
Mitchell Hashimoto 29e8d969cd Merge pull request #6322 from blueyed/doc-provisioning-file-mention-folder
doc: mention "directory" in the file provisioner reference
2015-11-18 14:01:02 -08:00
Mitchell Hashimoto 5bd805962d Merge pull request #6318 from handlers/edit-this-page
Add 'Edit this page' links to `www` and `docs` websites
2015-11-18 14:00:24 -08:00
Mitchell Hashimoto 9c2a9f198f update CHANGELOG 2015-11-18 13:59:45 -08:00
Seng Lin Shee f1647ddea6 Fixed unit test.
Command is now wrapped in more PowerShell scripts, changing its final encoded value.
2015-11-18 13:53:17 -08:00
Seng Lin Shee 774940521e Ignore Powershell progress updates on stderr
Starting with PowerShell 5, the progress bar can be observed via the
Write-Progress cmdlet. From WinRM, this appears as a stderr output.
Vagrant assumes that there is error if output appears on stderr.

This terminates various scripts which previously executed successfully
in Vagrant (prior to Windows 10).

This fix injects a variable assignment at various points of the script
execution process to disable display of the progress bar.
2015-11-18 13:52:25 -08:00
Mitchell Hashimoto 90b850aa49 Merge pull request #6307 from tbriggs-curse/fix/master/6306_chef_windows_capability
Fix/master/6306 chef windows capability
2015-11-18 13:48:48 -08:00
Mitchell Hashimoto 8ad2c91ad3 Merge pull request #6305 from justinlynn/feature/mitchellh-vagrant-6256-add-use_dhcp_assigned_default_route-to-html-documentation
Add use_dhcp_assigned_default_route to website documentation
2015-11-18 13:48:37 -08:00
Mitchell Hashimoto 5fe58dfb1a update CHANGELOG 2015-11-18 13:47:46 -08:00
Mitchell Hashimoto a31f505731 Merge pull request #6288 from rickard-von-essen/dnf
Use dnf on Fedora guests instead of yum if available.
2015-11-18 13:37:22 -08:00
Mitchell Hashimoto cf2566f186 update CHANGELOG 2015-11-18 13:16:01 -08:00
Mitchell Hashimoto c200190c5b Merge pull request #6259 from philipwigg/5943-fix-puppet-verify-binary
Fix verify_binary for Puppet for Windows guests.
2015-11-18 13:15:34 -08:00
Mitchell Hashimoto f8b243a810 Merge pull request #6254 from krig/suse-nfs-commands
Updated NFS commands for SUSE, add sudoers script for SUSE, fix sudoers scripts for Linux
2015-11-18 13:14:52 -08:00
Mitchell Hashimoto fbe10cf7f6 Merge pull request #6232 from mirthy/windows7-hostinfo
FIX: Use a .NET API call instead of a Win8+ cmdlet
2015-11-18 13:11:10 -08:00
Mitchell Hashimoto b34db6a433 Merge pull request #6219 from jgoldschrafe/f-better-ubuntu-systemd-detection
Better Ubuntu systemd detection
2015-11-18 13:10:09 -08:00
Mitchell Hashimoto e71e60ecac website/docs: document WinRM execution time limit 2015-11-18 13:05:08 -08:00
Mitchell Hashimoto d3bcc4e5f9 Merge pull request #6213 from jrob/winrm-execution-timeout
Winrm execution timeout
2015-11-18 13:00:59 -08:00
Mitchell Hashimoto 5b3bc95388 update CHANGELOG 2015-11-18 12:55:53 -08:00
Mitchell Hashimoto b7a610a808 Merge pull request #6203 from dustymabe/master
Fix Fedora /etc/hosts bug
2015-11-18 12:55:23 -08:00
Mitchell Hashimoto 10c53dfb4b update CHANGELOG 2015-11-18 12:54:42 -08:00
Mitchell Hashimoto 34dc9e237e Merge pull request #6195 from ArloL/fix-windows-xp-shell-provisioning
Check if Schedule.Service com object is available
2015-11-18 12:52:24 -08:00
Mitchell Hashimoto e6098f6c4f rename to powershell_elevated_interactive 2015-11-18 12:51:18 -08:00
Mitchell Hashimoto 0349793213 update CHANGELOG 2015-11-18 12:49:27 -08:00
Mitchell Hashimoto dde21bc95a fix file permissions 2015-11-18 12:48:41 -08:00
Mitchell Hashimoto 37940e7350 Merge pull request #6185 from marc-ta/elevated_interactive
Elevated interactive
2015-11-18 12:46:39 -08:00
Mitchell Hashimoto f02eb93d17 update CHANGELOG 2015-11-18 12:11:17 -08:00
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