Commit Graph

7768 Commits

Author SHA1 Message Date
John Syrinek ea7b277f41 Prevent fatal error caused by attempting to upload minion config to
privileged directory
2015-07-31 16:05:55 -05:00
Seth Vargo 8045869891 Update CHANGELOG 2015-07-27 11:03:49 -04:00
Seth Vargo d64d229c0f Merge pull request #5928 from mitchellh/sethvargo/ssh_exec_run_command
Use the same ssh args for ssh with a command as ssh exec
2015-07-27 11:02:36 -04:00
Seth Vargo 1813d7addb Merge pull request #6007 from darkn3rd/master
Fix for Issue #6006 - cfengine will now install
2015-07-26 11:37:35 -04:00
Seth Vargo 06c1e1ee1b Merge pull request #6012 from mitchellh/sethvargo/user_agent
Use a properly-formatted custom User-Agent
2015-07-20 23:54:31 -04:00
Seth Vargo d88d126ad9 Use a properly-formatted custom User-Agent 2015-07-20 23:33:31 -04:00
지훈 287831dd2e Fix for Issue #6006 - cfengine will now install 2015-07-20 02:08:13 -07:00
Mitchell Hashimoto b18671839f Merge pull request #6004 from pogliamarci/www-https-scripts
[website] load external scripts without schema
2015-07-19 15:20:57 -07:00
Marcello Pogliani c806b55f78 [website] load external scripts without schema
Avoid loading external stylesheets and scripts over plain HTTP when
using HTTPS (the default in vagrantup.com).
This avoids browsers blocking the external resources due to mixed
content issues when HTTPS is used (e.g., "This page is trying to load
scripts from unauthenticated sources" warning shown in Chrome).
2015-07-20 00:06:53 +02:00
Seth Vargo e0a15edef5 Merge pull request #5992 from PatOShea/patch-1
Clarified windows guest machine support for salt provisioner in documentation.
2015-07-18 12:55:57 -04:00
Pat O'Shea d6cf70bf20 Clarified windows guest machine support.
Done at mitchellh's request.
2015-07-18 08:25:40 -06:00
Mitchell Hashimoto 8c2dc41223 website/www: bump 2015-07-17 13:44:57 -07:00
Mitchell Hashimoto 78ea5e4a78 v1.7.4 2015-07-17 12:38:51 -07:00
Mitchell Hashimoto 4b217e2128 Merge pull request #5980 from PatOShea/PatOShea-ConfigDir-Typo
Fixed salt minion configuration directory typo
2015-07-17 12:37:44 -07:00
Pat O'Shea a4eede0c42 fixed typo for config_dir
Only exposed when calling highstate with config_dir being set
2015-07-16 18:45:59 -06:00
Pat O'Shea 3f2d2edf2b Merge pull request #2 from PatOShea/PatOShea-Minion-Config-Path
Changed minion config path for windows
2015-07-16 18:40:51 -06:00
Pat O'Shea 956bbf011c Changed minion config path for windows
Copy of minion is wrong on windows. Moved to sub-dir, conf.
2015-07-16 18:37:36 -06:00
Mitchell Hashimoto bac5d039db providers/docker: pull setting, default false [GH-5932] 2015-07-15 11:08:01 -07:00
Mitchell Hashimoto f26293bb06 hosts/linux: sudo to copy back to exports [GH-5957] 2015-07-15 11:04:05 -07:00
Mitchell Hashimoto ce5a30b264 provisioners/puppet: fix config merging [GH-5958] 2015-07-15 10:59:34 -07:00
Mitchell Hashimoto 3476491881 update CHANGELOG 2015-07-15 10:57:38 -07:00
Mitchell Hashimoto 087ffa67b2 Merge pull request #5967 from benh57/fix_puppetwin_path
Fix custom puppet.binary_path to work properly on windows and fix puppet detection on windows.
2015-07-15 10:56:19 -07:00
Mitchell Hashimoto 2ec7bf92e5 update CHANGELOG 2015-07-15 10:55:08 -07:00
Mitchell Hashimoto f540a301b6 Merge pull request #5971 from bheuvel/fix/master/5970
Raise Errno::ETIMEDOUT as "acceptable" Errors::ConnectionTimeout
2015-07-15 10:54:30 -07:00
Bob f12f50c552 Raise Errno::ETIMEDOUT as "acceptable" Errors::ConnectionTimeout 2015-07-15 19:41:10 +02:00
Ben Hines 46eedb6491 Back to using 'which' when no path is defined since the winrm communicator overrides it anyway. 2015-07-14 23:55:09 -07:00
Ben Hines 8c2ddac2cd Check for nil config_path. 2015-07-14 23:26:55 -07:00
Ben Hines 8c1ff5ee26 Fix custom puppet.binary_path to work properly on windows.
Fix automatic puppet path detection on windows
2015-07-14 23:21:46 -07:00
Mitchell Hashimoto 2209d7621b Merge pull request #5956 from mitchellh/sethvargo/rack_protection
Add Rack::Protection to sites
2015-07-13 08:50:24 -07:00
Seth Vargo b03b7f56a0 Add Rack::Protection to sites 2015-07-13 11:49:21 -04:00
Mitchell Hashimoto 1f1bbbfbb8 website/docs: note Vagrant version for NFS aliases [GH-5942] 2015-07-13 08:42:35 -07:00
Mitchell Hashimoto f08cb9f0a6 update CHANGELOG 2015-07-13 08:39:12 -07:00
Mitchell Hashimoto b118ab10c8 providers/virtualbox: remove windows UNC path [GH-5933] 2015-07-13 08:38:41 -07:00
Mitchell Hashimoto 9e2ab3b4c1 update CHANGELOG 2015-07-13 08:34:27 -07:00
Mitchell Hashimoto 39baec78e7 Merge pull request #5936 from wkral/fix-salt-bootstrap-install
Fix salt bootstrap issue after 1.7.3 upgrade with verbose option set
2015-07-13 08:34:01 -07:00
Mitchell Hashimoto bfa829d89b update CHANGELOG 2015-07-13 08:32:49 -07:00
Mitchell Hashimoto a9d5d6ae4a Merge pull request #5931 from kaorimatz/fix/guests-fedra-nmcli
guests/fedora: don't fail if nmcli doesn't exist on the guest
2015-07-13 08:31:01 -07:00
Mitchell Hashimoto 639f22c4d0 Merge pull request #5954 from mitchellh/sethvargo/tmpdir
Fallback to /tmp if $TMPDIR is not set
2015-07-13 08:30:25 -07:00
Seth Vargo 7328f91da2 Merge pull request #5949 from progamesigner/fix-nfs-systemd
Detect "systemd" on guest instead of host
2015-07-13 10:49:36 -04:00
Seth Vargo bfbf96c385 Fallback to /tmp if $TMPDIR is not set 2015-07-13 10:40:28 -04:00
Yang Sheng Han d09e8e6f50 guests/redhat: Fixed the NFS detection on guest, not host [GH-5948] 2015-07-13 14:18:27 +08:00
Seth Vargo 0796f052f0 Merge pull request #5937 from aidanhs/patch-1
Fix setting hostname in 12.04
2015-07-11 17:31:57 -04:00
aidanhs 13e2dbaf9d Fix setting hostname in 12.04
Fixes #5934
2015-07-11 19:15:54 +01:00
William Kral 27d7518636 Fix alignment of initializer 2015-07-11 10:40:17 -07:00
William Kral ccd7354665 Initialize the install_command salt config var 2015-07-11 10:31:19 -07:00
Satoshi Matsumoto 73d5718da3 guests/fedora: don't fail if nmcli doesn't exist on the guest 2015-07-11 16:14:11 +09:00
Mitchell Hashimoto 7743b8314d website 2015-07-10 17:07:17 -06:00
Mitchell Hashimoto 4af1e1a48f up version for dev 2015-07-10 17:03:40 -06:00
Mitchell Hashimoto 799fff6bc8 website/www: use bintray API 2015-07-10 17:00:01 -06:00
Mitchell Hashimoto 9d5727b738 website/www: up for deploy 2015-07-10 16:51:43 -06:00