Commit Graph

8815 Commits

Author SHA1 Message Date
Seth Vargo 17ebc7fca6 Merge pull request #6539 from mitchellh/revert-6406-5186
Revert "#5186: Warning: Authentication failure. Retrying... after packaging box"
2015-11-18 16:35:42 -08:00
Seth Vargo e9f4bca380 Revert "#5186: Warning: Authentication failure. Retrying... after packaging box" 2015-11-18 16:35:35 -08:00
Seth Vargo 48df85008c Rebase and cleanup conditional 2015-11-18 16:31:44 -08:00
Tristan Rivoallan 2c6ef938c7 Fix failing network test 2015-11-18 16:29:46 -08:00
Tristan Rivoallan 004fe0e7bb Make DHCP IP configurable
This makes it possible to have DHCP attribute IPs to guests under
various subnets
2015-11-18 16:29:46 -08:00
Seth Vargo 6af1f1e258 Update CHANGELOG 2015-11-18 16:26:14 -08:00
Seth Vargo ecf6087a90 Merge pull request #6537 from mitchellh/sethvargo/emit_upstart
Fix upstart detection and event emit
2015-11-18 16:26:06 -08:00
Mitchell Hashimoto 1a7937ed50 core: don't replace insecure key on base package [GH-5310] 2015-11-18 16:25:07 -08:00
Seth Vargo 42d0c3637c Merge pull request #6406 from markus-perl/5186
#5186: Warning: Authentication failure. Retrying... after packaging box
2015-11-18 16:23:44 -08:00
Seth Vargo 82f620ed13 Fix upstart detection and event emit 2015-11-18 16:18:32 -08:00
Mitchell Hashimoto 0ce636d1a3 core: avoid locking in trap context 2015-11-18 16:07:49 -08:00
Seth Vargo cab2926633 Update CHANGELOG 2015-11-18 16:04:59 -08:00
Seth Vargo f95b7914f7 Merge pull request #6515 from oliviermeurice/slack_net_conf
Slack net conf
2015-11-18 16:04:17 -08:00
Seth Vargo 69a9e33eff Merge pull request #6536 from mitchellh/sethvargo/network_manager
Check if the network manager is before reloading
2015-11-18 16:03:10 -08:00
Mitchell Hashimoto da116bffec fix syntax error 2015-11-18 15:57:58 -08:00
Mitchell Hashimoto 0ebd600c89 update CHANGELOG 2015-11-18 15:57:30 -08:00
Mitchell Hashimoto 6602d06266 Merge pull request #6535 from mitchellh/f-prune-index
core: prune machine if non-existent CWD from index [GH-4742]
2015-11-18 15:56:24 -08:00
Mitchell Hashimoto 538ffcd292 clarify guest to host in forwarded port output [GH-4796] 2015-11-18 15:55:48 -08:00
Seth Vargo 1f6e5aa081 Check if the network manager is before reloading 2015-11-18 15:55:11 -08:00
Mitchell Hashimoto 85f1e05e2a core: prune machine if non-existent CWD from index [GH-4742] 2015-11-18 15:48:59 -08:00
Seth Vargo c743d88ad6 Fix bad options 2015-11-18 15:26:45 -08:00
Mitchell Hashimoto d425193e42 Merge pull request #6493 from Ingramz/master
Re-enable UNC paths for shared folders on Windows hosts
2015-11-18 15:20:21 -08:00
Mitchell Hashimoto c43e0af4d7 Merge pull request #6382 from sophicware/fix/salt-provisioner-install-args
[salt] [bugfix] Restablize Salt provisioner
2015-11-18 15:19:02 -08:00
Mitchell Hashimoto 394f66468d Merge pull request #6489 from invernizzi/master
Update docker installer to work on custom kernels
2015-11-18 15:16:32 -08:00
Mitchell Hashimoto a6f56b1592 update CHANGELOG 2015-11-18 15:15:22 -08:00
Mitchell Hashimoto c754c0bf34 Merge pull request #6488 from dvorak/rescue-enetunreach
Add Errno::ENETUNREACH to SSH rescue
2015-11-18 15:13:59 -08:00
Mitchell Hashimoto 9ce26393bb Merge pull request #6479 from legal90/fix-fp-collision-handling
Bugfix: Remove redundant app call from action "handle_forwarded_port_collisions"
2015-11-18 15:13:40 -08:00
Mitchell Hashimoto 9e1a119a4b Merge pull request #6475 from nikelmwann/linux-host-use-xfreerdp
Prefer xfreerdp for RDP connections on Linux hosts.
2015-11-18 15:12:47 -08:00
Mitchell Hashimoto fbdb6c0d19 Merge pull request #6474 from aneeshusa/enable-salt-options-for-masterless
Enable log_level and colorize for salt masterless
2015-11-18 15:11:54 -08:00
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