d7b398a905
Merge branch 'fix/master/puppet-provisioner-nfs-support' of https://github.com/mfournier/vagrant into mfournier-fix/master/puppet-provisioner-nfs-support
...
Conflicts:
CHANGELOG.md
plugins/provisioners/puppet/provisioner/puppet.rb
2013-09-01 13:32:49 -07:00
3a14d27f90
core: Arbitrary NFS options with nfs_options [GH-1029]
2013-09-01 13:08:02 -07:00
4329c9f06d
Update CHANGELOG
2013-09-01 12:28:51 -07:00
df02ddb68c
core: note backwards incompat in code
2013-09-01 12:27:15 -07:00
e5b35d1c83
core: support "mount_options" for arbitrary mount options [GH-1029]
2013-09-01 12:25:21 -07:00
2d2180e5a5
hosts/linux: fix NFS prune regex
2013-09-01 12:00:36 -07:00
a6aa16dcad
hosts/bsd: proper NFS prune sed syntax
2013-09-01 11:58:52 -07:00
b4d67d2e05
Update CHANGELOG
2013-09-01 11:44:43 -07:00
65ef8d2477
Merge branch 'nfs-per-user' of https://github.com/davedevelopment/vagrant into davedevelopment-nfs-per-user
...
Conflicts:
plugins/hosts/arch/host.rb
plugins/hosts/bsd/host.rb
plugins/hosts/linux/host.rb
templates/nfs/exports.erb
templates/nfs/exports_freebsd.erb
templates/nfs/exports_linux.erb
2013-09-01 11:44:00 -07:00
c63d4fd6b8
hosts/bsd: nice error if can't read exports file [GH-2038]
2013-09-01 10:25:00 -07:00
4608e75b48
core: clean up machine directory when id = nil
2013-08-31 23:02:16 -07:00
a96efcdec9
providers/virtualbox: only set default name on first up [GH-1817]
2013-08-31 22:43:33 -07:00
9e38601f18
provisioners/puppet: run from correct working directory [GH-1967]
2013-08-31 22:24:30 -07:00
949416c76c
provisioners/ansible: use proper config name [GH-2104]
2013-08-31 21:48:41 -07:00
c4e79db552
commmands/box/remove: fix exception when no provider specified [GH-2100]
2013-08-30 09:43:35 -07:00
e5db091b1c
provisioners/salt: default bootstrap script gets latest
2013-08-29 17:40:59 -07:00
874994ff73
provisioners/salt: remove unused code
2013-08-29 17:26:52 -07:00
d154aafc0d
provisioners/salt: remove vagrant check, we core now
2013-08-29 17:08:49 -07:00
646ee00870
Update CHANGELOG
2013-08-29 17:07:40 -07:00
93d5182230
Merge pull request #1626 from raadad/salty-vagrant-provisioner
...
Salt provisioner.
2013-08-29 17:06:16 -07:00
c38d28f1c5
providers/virtualbox: 4.2 max network adapters to 36 [GH-1886]
2013-08-29 16:50:20 -07:00
0f4ba6dc3b
providers/virtualbox: Run post-boot after boot but before wait for SSH
...
[GH-2048]
2013-08-29 16:44:32 -07:00
47594036b4
Add support for remote shell provisioner script
2013-08-29 20:44:14 -03:00
283d2ae74b
fix broken test
2013-08-29 16:42:59 -07:00
5a4c06f75e
core: config.ssh.timeout => config.vm.boot_timeout
2013-08-29 16:41:36 -07:00
c38fadfd2f
core: config.vm.graceful_halt_timeout to specify graceful halt timeout
2013-08-29 16:38:02 -07:00
96ed15bad4
Next version will be 1.3.0, update cHANGELOG
2013-08-29 16:29:27 -07:00
f2adeb0f0f
Update CHANGELOG
2013-08-29 16:28:43 -07:00
261d0ef6cd
core: WaitForCommunicator - more robust wait for boot
...
This is a new built-in middleware that is more robust for
waiting for boots. The "max_tries" configuration is now gone, it is
timeout based. Future commits will make this even better as the
SSH communicator will implement the new "wait_for_ready" in a better
way.
2013-08-29 16:27:00 -07:00
2b7a1297c8
core: set `disabled: true` for disabling forwarded port [GH-1922]
2013-08-29 12:25:53 -07:00
c2012ff944
commands/up: flag --no-destroy-on-error [GH-2011]
2013-08-29 12:13:02 -07:00
9e476330f4
provisioners/ansible: execute ansible with cwd of root_path [GH-2051]
2013-08-29 11:55:58 -07:00
d90c3ba782
Update CHANGELOG
2013-08-29 11:46:32 -07:00
5b42994406
core: better cleanup of ".vagrant"
2013-08-29 11:45:57 -07:00
1ac3fb39fc
provisioners/chef: error if knife not found and auto-deleting
2013-08-29 11:36:37 -07:00
0227dd26b1
Update CHANGELOG
2013-08-29 11:27:56 -07:00
26b32bf8cd
provisioners/chef: don't delete node/client by default
2013-08-29 11:27:00 -07:00
a8ebd30cb9
provisioners/chef: use Subprocess to execute knife
2013-08-29 11:26:21 -07:00
38a6f863e7
core: Inherit CommandUnavailableWindows from CommandUnavailable
2013-08-29 11:18:21 -07:00
d4c7e20110
core: ProvisionerCleanup task to run cleanup on provisioners
2013-08-29 11:13:43 -07:00
93c98aad01
Merge branch 'pr/1267'
...
Conflicts:
plugins/provisioners/chef/provisioner/chef_client.rb
2013-08-29 10:50:50 -07:00
50fdf1358c
communicators/ssh: handle closed connection without exception
2013-08-29 10:36:23 -07:00
e8bdc817f0
Update CHANGELOG
2013-08-28 22:45:01 -07:00
54ac2e8448
Merge pull request #1713 from akalyaev/respect-nec-type-option-for-private-networks-1704
...
core: respect :nic_type option for private network. Fixes #1704
2013-08-28 22:44:20 -07:00
82006dfc96
Update CHANGELOG
2013-08-28 22:30:28 -07:00
349b2507f9
Merge branch 'unpriv_shell' of https://github.com/frsantos/vagrant into frsantos-unpriv_shell
...
Conflicts:
plugins/provisioners/shell/config.rb
plugins/provisioners/shell/provisioner.rb
2013-08-28 22:29:49 -07:00
0e9711d0dd
kernel: config.vm.host_name works again
2013-08-28 17:17:07 -07:00
caf153270a
Update CHANGELOG
2013-08-28 17:03:42 -07:00
826c8a884d
Merge pull request #1801 from davegudge/patch-1
...
core: use getent to get group ID
2013-08-28 17:02:46 -07:00
adb72b07d5
plugins/provisioners: put generated inventory file in vagrantfile dir
2013-08-28 16:54:44 -07:00
Mitchell Hashimoto
Fabio Rehm