Commit Graph

7521 Commits

Author SHA1 Message Date
Pat O'Shea 3eb93a4501 Merge branch 'master' of github.com:PatOShea/vagrant 2015-07-07 00:28:49 -06:00
Pat O'Shea da67824a53 Adding run_service and minion/master ids for windows 2015-07-07 00:24:23 -06:00
Pat O'Shea 58009d1de4 Merge pull request #1 from PatOShea/PatOShea-Salt-Documentation
Update salt options in documentation
2015-07-06 20:39:30 -06:00
Pat O'Shea c6a49defab Update salt options
Added details about what works for windows and what doesn't, fixed typo, broke runners out from states, added 3 options (version, masterless, and minion_id).
2015-07-06 20:36:21 -06:00
Pat O'Shea eab702da83 Adding config to set version to install 2015-07-04 01:25:31 -06:00
Seth Vargo 28a42122b8 Update CHANGELOG 2015-06-10 09:15:37 -04:00
Seth Vargo 6a926793d9 Merge pull request #5805 from cisco87/patch-1
Use the extended password parameter, more compatible
2015-06-10 09:14:51 -04:00
Francesco c66df8cd2c Updating the test to see the changes to the mount pass parameter 2015-06-08 09:48:21 +01:00
Francesco ca8923835a Use the extended password parameter, more compatible 2015-06-08 04:13:23 +01:00
Seth Vargo 72fe7d045d Merge pull request #5801 from jjasghar/patch-2
Update chef_solo.html.md
2015-06-06 12:10:50 -04:00
Seth Vargo 35bcc9f6c6 Merge pull request #5800 from jjasghar/patch-1
Update chef_client.html.md
2015-06-06 12:10:40 -04:00
JJ Asghar 1b75dfd562 Update chef_solo.html.md
Updated to the new chef.io site.
2015-06-05 15:36:17 -05:00
JJ Asghar 2870d299de Update chef_client.html.md
Updated to the new chef.io site.
2015-06-05 15:34:07 -05:00
Seth Vargo b420da0678 Merge pull request #5795 from ivuk/fix-typo
Fix a typo in ssh_settings.html.md
2015-06-04 14:21:09 -04:00
Igor Vuk b072e8bcf5 Fix a typo in ssh_settings.html.md 2015-06-04 19:58:56 +02:00
Seth Vargo 2b415d092e Whoops - don't comment that out
/cc @mbrodala
2015-06-03 12:11:39 -04:00
Seth Vargo e071ce4663 Update CHANGELOG 2015-06-02 18:14:27 -04:00
Seth Vargo dc60d6b82c Merge pull request #5785 from mitchellh/sethvargo/ignore_hidden_dirs
Ignore hidden directories
2015-06-02 17:44:29 -04:00
Seth Vargo 345935887f Style fixes 2015-06-02 17:18:50 -04:00
Philip Wrenn 4c8fe42d70 Ignore possible version directories that are hidden folders, i.e. dot folders. 2015-06-02 17:09:10 -04:00
Seth Vargo 9b4a498f82 Update CHANGELOG 2015-06-02 17:07:41 -04:00
Seth Vargo a7aea0953f Merge pull request #5771 from mitchellh/sethvargo/color
Add UI::Interface#color?
2015-06-02 17:07:08 -04:00
Seth Vargo e34679c20f Merge pull request #5775 from sschuberth/master
website: Improve description to enable Hyper-V on Windows 8.1
2015-06-02 17:05:40 -04:00
Sebastian Schuberth 5ad6b7e553 website: Improve description to enable Hyper-V on Windows 8.1
The step to click on "Turn Windows features on or off" was missing.
2015-06-02 10:05:39 +02:00
Seth Vargo b92d4b21a1 Add UI::Interface#color? 2015-06-01 11:49:09 -04:00
Gilles Cornu 272fb27e05 provisioners/ansible: trim white spaces
[ci skip]
2015-06-01 10:12:22 +02:00
Gilles Cornu f7894d9c8c provisioners/ansible: fix broken colorized output
After #5532 (e745436df3), it was no longer
possible to enable ansible colorized output. Even though
`ANSIBLE_NOCOLOR` has no effect *at the moment* in vagrant+ansible
integration, I agree to keep it for clarity and consistence.

The new `--no-color` behaviour (bug fix #5531) is now covered by a unit
test.

//cc @marsam, @sethvargo
2015-06-01 08:36:09 +02:00
Seth Vargo 2daa9ed175 Merge pull request #5591 from paperlesspost/extract_shell_cmd
Move shell_cmd to a method in SSH::Communicator
2015-05-31 20:57:46 -07:00
Seth Vargo 1413cd56cf Merge pull request #5626 from brooksbrown/smb-docs-update
Added a note on PowerShell to prerequisites SMB documentation.
2015-05-31 20:53:01 -07:00
Seth Vargo a642663a73 Merge pull request #5584 from stoned/fix-locale-en
Fix message provision / disabled_by_config
2015-05-31 20:46:44 -07:00
Seth Vargo f48b704ba0 Update CHANGELOG 2015-05-31 20:45:37 -07:00
Seth Vargo 3017243a24 Merge pull request #5577 from luciddg/fix/master/docker-provisioner-restart-fix
Use service command to restart docker, not upstart.
2015-05-31 20:44:48 -07:00
Seth Vargo 13b8cda214 Merge pull request #5544 from bdwyertech/bdwyertech-patch-1
VMware Documentation Fix - SED Syntax
2015-05-31 20:41:57 -07:00
Seth Vargo f1928959dc Update CHANGELOG 2015-05-31 20:34:57 -07:00
Seth Vargo 6a48af6350 Merge pull request #5532 from marsam/fix/master/ansible-no-color
Disable color if in ansible provisioner if Vagrant has no color
2015-05-31 20:34:06 -07:00
Seth Vargo 99e0cac237 Update CHANGELOG 2015-05-31 20:32:09 -07:00
Seth Vargo dc713cbd66 Merge pull request #5517 from obnoxxx/fix-freebsd-ssh-remove-key
guests/freebsd: fix call of set -i : missing extension
2015-05-31 20:31:04 -07:00
Seth Vargo d7283277cf Update CHANGELOG 2015-05-31 20:20:15 -07:00
Seth Vargo 6309847420 Merge pull request #5512 from johnsonj/issue_3620
For SMB on Linux guests, specify the user's domain as a separate parameter
2015-05-31 20:19:08 -07:00
Seth Vargo 06fe7163d2 Update CHANGELOG 2015-05-31 20:11:11 -07:00
Seth Vargo 624a3200f3 Merge pull request #5478 from aogail/ignore-windows-virtual-network-connections
Ignore Windows NICs with nil :net_connection_id
2015-05-31 20:10:08 -07:00
Seth Vargo 50b78b6039 Update CHANGELOG 2015-05-31 20:09:30 -07:00
Seth Vargo f5c77765fa Merge pull request #5437 from Jamezz/master
Fix issue #4152: Salt minion bootstrapping
2015-05-31 20:08:32 -07:00
Seth Vargo 655d1adf6f Update CHANGELOG 2015-05-31 19:08:10 -07:00
Seth Vargo 50f8c161e3 Merge pull request #5770 from mitchellh/pr-4847
Add nfs and flavor cap to Fedora
2015-05-31 19:07:04 -07:00
Seth Vargo 19f3c10777 Always return the version 2015-05-31 19:02:24 -07:00
Seth Vargo 30dda77454 Remove unneeded tap on nfs_client cap for Fedora 2015-05-31 19:02:23 -07:00
Seth Vargo 3fcd3d691a Fix syntax errors and style on Fedora flavor cap 2015-05-31 19:02:23 -07:00
langdon efd7b459dd Add more capabilities for Fedora guests 2015-05-31 19:02:23 -07:00
Seth Vargo ece8e858a6 Update CHANGELOG 2015-05-31 18:40:05 -07:00