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
Manuel Pöter
f4d1d068f9
Merge branch 'master' into VB-linked-clone-support
2015-07-13 10:56:17 +02: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
Mitchell Hashimoto
0fa6b17bfb
website/www: fix for new bintray format
2015-07-10 16:45:46 -06:00
Mitchell Hashimoto
20e851dd85
scripts: new website locations
2015-07-10 16:34:23 -06:00
Mitchell Hashimoto
58ccb48899
website: update Ruby version
2015-07-10 16:33:47 -06:00
Mitchell Hashimoto
364db17e3d
v1.7.3
2015-07-10 15:37:36 -06:00
Mitchell Hashimoto
dec5f70a1e
core: fix jailbreaking of plugins
...
/cc @sethvargo
2015-07-10 15:34:59 -06:00
Kevin Fishner
53dddeb2b8
targeting scripts
2015-07-10 15:21:00 -06:00
Mitchell Hashimoto
efe62cfe2a
up version for dev
2015-07-10 15:09:11 -06:00
Mitchell Hashimoto
fe581a2085
Merge pull request #5927 from mitchellh/sethvargo/sudo_read_ip_address
...
Use sudo for read_ip_address capability
2015-07-10 14:33:30 -06:00
Seth Vargo
fc1d2c29be
Use the same ssh args for ssh with a command as ssh exec
2015-07-10 13:55:00 -06:00
Seth Vargo
5f383b546c
Use sudo for read_ip_address capability
...
Fixes #4868
2015-07-10 13:25:11 -06:00
Seth Vargo
00f1e46777
Update docs to support VirtualBox 5
2015-07-10 13:17:36 -06:00
Mitchell Hashimoto
3f7f85c076
v1.7.3
2015-07-10 12:47:42 -06:00
Seth Vargo
beb5bce698
Update CHANGELOG
2015-07-10 11:54:20 -06:00
Mitchell Hashimoto
f6bf8b4789
Merge pull request #5924 from mitchellh/sethvargo/docker_check_args
...
Save docker args to check if running containers have changed in the Vagrantfile
2015-07-10 11:52:20 -06:00
Mitchell Hashimoto
66b1ac7f05
Merge pull request #5922 from mitchellh/sethvargo/docker_space_args
...
Add a space before args
2015-07-10 11:50:07 -06:00
Seth Vargo
516d475f16
Checksum args to each docker container in local data
...
This allows Vagrant to calculate if a container's arguments (such as the run
arguments) have changed in the Vagrantfile since the original run.
Fixes GH-3055
2015-07-10 11:32:02 -06:00
Seth Vargo
3e3037f313
Add a space before args
2015-07-10 10:49:21 -06:00
Gilles Cornu
247fe72068
docs: update ansible provisioner guide [GH-5765]
...
[ci skip]
2015-07-10 17:36:05 +02:00