haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,216 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

8216 Commits

Author SHA1 Message Date
Mitchell Hashimoto 7c9fd58786 core: log if not checking box metadata 2015-11-18 18:09:18 -08:00
Mitchell Hashimoto 646414b347 core: don't make dotfile path if no Vagrantfile 2015-11-18 17:48:24 -08:00
Mitchell Hashimoto 7c49fd1418 core: fix crash on invalid checksum type [GH-6327] 2015-11-18 17:36:52 -08:00
Mitchell Hashimoto eb5a6fc7c3 communicators/ssh: more nil guards [GH-6225] 2015-11-18 17:32:40 -08:00
Mitchell Hashimoto 6f3ed13f75 providers/virtualbox: run provisioners on suspend resume 2015-11-18 17:16:23 -08:00
Mitchell Hashimoto 0e32612324 fix more tests 2015-11-18 17:13:47 -08:00
Mitchell Hashimoto 925d7c5bf6 Revert "Make DHCP IP configurable" 
This reverts commit 004fe0e7bb.
 2015-11-18 17:11:58 -08:00
Mitchell Hashimoto c76e45a75a fix some tests 2015-11-18 17:11:05 -08:00
Seth Vargo 2dfc96c536 Update CHANGELOG 2015-11-18 17:01:21 -08:00
Seth Vargo c5c127e538 Merge pull request #6541 from mitchellh/sethvargo/chef_delete_empty_name 
Do not throw an error when the Chef node_name is nil
 2015-11-18 16:59:07 -08:00
Seth Vargo a1a3824e35 Do not throw an error when the Chef node_name is nil 2015-11-18 16:56:31 -08:00
Mitchell Hashimoto 891c47c742 core: don't do HEAD request for box on non-HTTP [GH-5477] 2015-11-18 16:52:40 -08:00
Seth Vargo 733a583b69 Update CHANGELOG 2015-11-18 16:47:03 -08:00
Seth Vargo 244069d5d7 Merge pull request #6049 from bdwyertech/bdwyertech-patch-2 
Chef Zero - Fix 'nodes_path' Support
 2015-11-18 16:46:02 -08:00
Seth Vargo 3328fa3fb8 Update CHANGELOG 2015-11-18 16:42:18 -08:00
Seth Vargo 96a815e84e Merge pull request #6538 from mitchellh/sethvargo/pr-6325 
Make DHCP IP configurable
 2015-11-18 16:41:30 -08:00
Seth Vargo 28ddd6927b Update docs 2015-11-18 16:41:20 -08:00
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