Commit Graph

7302 Commits

Author SHA1 Message Date
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
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
Seth Vargo a755cf285a Clarify first sentence about project setup 2015-02-09 09:40:20 -05:00
Schneider Werner-Walter 02c0bfafc6 Add Scientific Linux to RHEL 7 flavors. 2015-02-08 02:56:44 +02:00
cubetto 2e659bf12c Update host_machine_build_dir.rb 2015-02-07 20:33:55 -03:00
Christopher Chan-Nui a6361a750c Copy linux support for insert_public_key and remove_public_key to solaris11. 2015-02-04 16:58:17 -06:00
Seth Vargo b2c722ef54 Update CHANGELOG 2015-02-04 13:30:24 -05:00
Seth Vargo 2c88f7b7d9 Merge pull request #5283 from mitchellh/sethvargo/developed_on
Add extra metadata information to Atlas pushes
2015-02-04 13:29:41 -05:00
Seth Vargo 7d25a687ca Add tests for sending metadata 2015-02-04 11:45:02 -05:00
Seth Vargo 257ff57772 Remove message for now 2015-02-03 21:06:51 -05:00
Seth Vargo 82b24e9a8f Pass in a message to the command as well 2015-02-03 19:20:27 -05:00
Seth Vargo d29a474fbb Cleanup that syntax 2015-02-03 19:20:12 -05:00
Seth Vargo 0dde0b3756 Use a real iso env for push tests 2015-02-03 19:19:58 -05:00
Seth Vargo edbc3e74d4 Pass metadata to push command 2015-02-03 19:19:51 -05:00
Seth Vargo 52d0df3296 Add --message option to `vagrant push` 2015-02-03 19:19:08 -05:00
Félix Bellanger b776fe74b8 detect fedora 21 2015-02-03 10:23:35 +01:00
Mitchell Hashimoto ef7cf679dc Revet CHANGELOG 2015-02-03 06:40:16 +01:00
Mitchell Hashimoto a0be121f4f Revert "Merge pull request #5274 from mitchellh/sethvargo/atlas_api"
This reverts commit 7f19284ef4, reversing
changes made to f0284d000b.
2015-02-03 06:39:28 +01:00
Seth Vargo bc7272b96d Update CHANGELOG 2015-02-02 19:38:02 -05:00
Seth Vargo 7f19284ef4 Merge pull request #5274 from mitchellh/sethvargo/atlas_api
Use the new Atlas APIs for downloading boxes
2015-02-02 19:37:20 -05:00
Seth Vargo 6fd685e96d Fix failing tests 2015-02-02 19:24:50 -05:00
Seth Vargo bec0f28f40 Use the new Atlas APIs for downloading boxes 2015-02-02 18:14:21 -05:00
Seth Vargo f0284d000b Merge pull request #5272 from mitchellh/sethvargo/remove_box
Do not encourage users to download a box directly
2015-02-02 11:09:56 -05:00
Seth Vargo fe312beef2 Do not encourage users to download a box directly
Instead of having the user download a .box file and manually installing it,
just use the hashicorp/precise64 box and let Vagrant handle the download.
2015-02-02 11:07:41 -05:00
Seth Vargo c766a1fdae Merge pull request #5264 from aknrdureegaesr/link-to-env-in-cli-doc
Make the environment variable documentation more easy to find.
2015-01-29 11:39:27 -05:00
Andreas Krüger 0501cd5500 Adding a link to the environment variable documentation to the cli documentation. 2015-01-29 17:26:54 +01:00
Seth Vargo deadf816e1 Merge pull request #5257 from aknrdureegaesr/master
Kindly document how to disable checkpoint remote call.
2015-01-29 11:20:15 -05:00
Andreas Krüger f2042c9cb3 Document how to disable remote call to https://checkpoint-api.hashicorp.com . 2015-01-29 17:15:17 +01:00
Blair Hamilton 7784ee2d09 Revert "Rename Windows guest without reboot" 2015-01-28 20:00:24 -05:00
Max Lincoln 39882957ee Add retry_delay setting to speed up test 2015-01-28 13:41:07 -05:00
Max Lincoln 5d5e13bc0f Change authorization error tests to match WinRM 1.3 2015-01-28 13:41:07 -05:00
Richard Guin 56a6c85e7d Windows rsync needs to create folders before syncing 2015-01-28 13:07:36 -05:00
Max Lincoln c37c12526a Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
Conflicts:
	vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal 6378deacd6 Merge pull request #5225 from mitchellh/winrm-fs-dependency
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Mitchell Hashimoto 37b60f54ea Merge pull request #5244 from mitchellh/log-action-name
core: log action name to info
2015-01-24 14:17:32 -08:00