Commit Graph

7390 Commits

Author SHA1 Message Date
Mitchell Hashimoto 3c5e057177 update CHANGELOG 2015-02-24 09:48:26 -08:00
Mitchell Hashimoto 55d54b5832 Merge pull request #5290 from channui/solaris11-plugin
guests/solaris11: Copy linux support for insert_public_key and remove_public_key to solari...
2015-02-24 09:48:02 -08:00
Mitchell Hashimoto ae69ada165 update CHANGELOG 2015-02-24 09:47:40 -08:00
Mitchell Hashimoto 104f2106ce Merge pull request #5302 from cubetto/fix-docker-no-space-to-build
providers/docker: build docker image from /var/lib/docker
2015-02-24 09:47:08 -08:00
Mitchell Hashimoto 44df53844a update CHANGELOG 2015-02-24 09:46:16 -08:00
Mitchell Hashimoto 2dfc1e1c49 Merge pull request #5303 from SchnWalter/add-sl7-flavor
guests/redhat: Add Scientific Linux to RHEL 7 flavors.
2015-02-24 09:45:56 -08:00
Mitchell Hashimoto 1c15a6d31e update cHANGELOG 2015-02-24 09:45:28 -08:00
Mitchell Hashimoto 734b0d6695 Merge pull request #5315 from jimmidyson/non-existent-docker-group
provisioners/docker: only add user to docker group if docker group exists
2015-02-24 09:45:03 -08:00
Mitchell Hashimoto c4f00cc2c2 update CHANGELOG 2015-02-24 09:44:00 -08:00
Mitchell Hashimoto d399bdae8f Merge pull request #5320 from epicagency/master
providers/virtualbox: support Regexp usage for bridge configuration
2015-02-24 09:43:36 -08:00
Mitchell Hashimoto 91bfacca4a update CHANGELOG 2015-02-24 09:37:07 -08:00
Mitchell Hashimoto e5d3a561cf Merge pull request #5326 from timsutton/ssh-insert-key-darwin
guests/darwin: Support insert_public_key and remove_public_key on darwin guest
2015-02-24 09:36:41 -08:00
Mitchell Hashimoto 6e2bd6a491 Merge pull request #5328 from kev009/master
Relax i18n gem spec to support 0.7.0
2015-02-24 09:35:57 -08:00
Victor Schröder 8f6ebcacb9 [DOCS] Clarifies the entry for config.ssh.insert_key 2015-02-24 18:35:20 +01:00
Mitchell Hashimoto 5a7abc2b2f website/docs: update salt docs 2015-02-24 09:32:55 -08:00
Mitchell Hashimoto 3a142cbf30 Merge pull request #5337 from mafrosis/docs-salt
website/docs: Added bootstrap_options param to the salt provisioner docs
2015-02-24 09:32:13 -08:00
Mitchell Hashimoto 577a5222d9 website/docs: wording of default router docs 2015-02-24 09:30:58 -08:00
Mitchell Hashimoto c34696bc4f Merge pull request #5338 from kikitux/master
website/docs: example to set default router on public net
2015-02-24 09:28:08 -08:00
Mitchell Hashimoto ad1c462127 update CHANGELOG 2015-02-24 09:27:02 -08:00
Mitchell Hashimoto 8b2f9e184a update CHANGELOG 2015-02-24 09:26:34 -08:00
Mitchell Hashimoto 7900fc65fc Merge pull request #5349 from agreenbhm/master
hosts/windows: update host_info.ps1
2015-02-24 09:26:27 -08:00
Mitchell Hashimoto 7e238e06be Merge pull request #5369 from gpkfr/support_debian_jessie
Fix #5368 Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution...
2015-02-24 09:23:31 -08:00
Mitchell Hashimoto 0c672fe59c Merge pull request #5382 from delftswa2014/fix-links-chef_solo-doc
website/docs: fixes broken/deprecated links on the chef_solo provisioner documentation
2015-02-24 09:22:35 -08:00
Mitchell Hashimoto 752adb5235 update CHANGELOG 2015-02-24 09:21:16 -08:00
erwinvaneyk 4f81e12684 Fixes broken/deprecated links on the chef_solo documentation
- links to http://docs.chef.io/roles.html instead of https://docs.chef.io/essentials_roles.html
- links to https://docs.chef.io/nodes.html#about-run-lists instead of https://docs.chef.io/essentials_node_object_run_lists.html
- links to http://docs.chef.io/data_bags.html instead of https://docs.chef.io/essentials_data_bags.html
2015-02-24 14:31:24 +01:00
gpkfr c01c4bf41e remove extra spaces on plugin.rb ;). 2015-02-20 20:49:50 +01:00
gpkfr 1eedc2b5f1 Added specific support for Debian 8 (aka jessie) to permit proper vagrant halt execution 2015-02-20 20:15:05 +01:00
agreenbhm a1f6bfb1f2 Update host_info.ps1 2015-02-18 11:53:03 -05:00
agreenbhm 2557e5f3f8 Update host_info.ps1
Changed method for getting IP addresses.  Windows built-in VPN IP addresses do not appear in list using Get-WMIObject, causing shared folders to fail.
2015-02-17 13:04:54 -05:00
Shawn Neal 92762eeb8c Merge pull request #4943 from maxlinc/winrm_error_handling
Improved WinRM error handling (including better `ready?` and `wait_for_ready`)
2015-02-16 10:16:14 -08:00
Seth Vargo 09724ec336 Update CHANGELOG 2015-02-16 11:33:51 -05:00
Seth Vargo 9bdff90d7c Merge pull request #5339 from YpNo/master
Chef Provisioner : Support real chef-zero/local mode
2015-02-16 11:32:56 -05:00
Max Lincoln 583254b2b7 Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
Conflicts:
	plugins/communicators/winrm/config.rb
	plugins/communicators/winrm/shell.rb
	test/unit/plugins/communicators/winrm/shell_test.rb
2015-02-16 10:30:12 -05:00
Michael Lopez 530cb331ae Update chef_zero provisioner documentation 2015-02-15 10:11:22 +01:00
Michael Lopez 2f3e550a81 Remove white space after bang 2015-02-15 09:43:37 +01:00
Michael Lopez 4ece2ba43e Update chef docs with enable_reporting option 2015-02-14 22:34:11 +01:00
Michael Lopez 6ba6c7c1c3 Update unit tests for chef_zero provisioner 2015-02-14 22:33:23 +01:00
Michael Lopez 8adc10f295 Update chef_zero provisioner to use real chef-zero/local-mode to support cookbook version constraint 2015-02-14 22:32:16 +01:00
Michael Lopez 74ffcb27d6 Add 'enable_reporting' attribute for chef provisioner 2015-02-14 22:28:32 +01:00
Alvaro Miranda fd7d1080f9 example to set default router on public net
Add disable auto-configuration on public net
Add example to setup manually ip and ipv6
Add example to set default router for ip and ipv6
2015-02-14 16:27:22 +13:00
Shawn Neal 09a463f1ac Merge pull request #4236 from maxlinc/winrmssl
Add WinRM over SSL support - (replaces #3960)
2015-02-13 17:26:58 -08:00
mafro a4724521f5 added bootstrap_options param to the salt provisioner docs 2015-02-14 09:56:54 +11:00
Seth Vargo 319175b7f1 Merge pull request #5329 from kikitux/master
fix command on vagrant push website sample script
2015-02-11 21:07:59 -05:00
Alvaro Miranda f62c570d97 fix command on vagrant push website sample script
fix sample to scp -r . server:/var/ww/website
2015-02-12 14:58:04 +13:00
Kevin Bowling 7ce6c10aa9 Relax i18n gem spec to support 0.7.0 2015-02-11 14:01:10 -07:00
Timothy Sutton c6e16beaa5 Support insert_public_key and remove_public_key on darwin guest
- fixes #5204
- darwin-specific sed arguments thanks to @elatt
2015-02-11 12:21:23 -05:00
Frank Baalbergen 90719dc82f vagrant duplicates >= eth2 when defining two config.vm.network :private_network
When a vagrant box has two private network ips /etc/network/interfaces
will duplicate eth2 and bigger. sed matches greedy, so the first
 #VAGRANT-END matches. This will result in:

/etc/network/interfaces:29: interface eth2 declared allow-auto twice
/sbin/ifup: couldn't read interfaces file "/etc/network/interfaces"
2015-02-11 15:37:41 +01:00
Hugues Lismonde 887f94260e Support Regexp usage for bridge configuration 2015-02-11 11:07:03 +01:00
Jimmi Dyson be2643d40d Only add user to docker group if docker group exists (doesn't in recent Fedora docker-io installs) 2015-02-10 18:11:39 +00:00
Max Lincoln d6e91483a6 Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
Conflicts:
	vagrant.gemspec
2015-02-09 11:10:23 -05:00