034c151720
Merge branch 'resumable-download' of https://github.com/rconradharris/vagrant into rconradharris-resumable-download
...
Conflicts:
CHANGELOG.md
2013-11-23 15:42:48 -08:00
45702f9d44
Merge branch 'issue_2333' of https://github.com/elliotsegler/vagrant into elliotsegler-issue_2333
...
Conflicts:
plugins/guests/ubuntu/cap/change_host_name.rb
2013-11-23 15:38:49 -08:00
7aa3a3967d
website/docs: document how long compatibility will be aroung
2013-11-23 14:14:01 -08:00
8a0f209f3f
website/docs: document need for private network for NFS
2013-11-23 14:07:46 -08:00
97389d4255
core: output synopsis with command [GH-2249]
2013-11-23 14:00:42 -08:00
844c672911
website/docs: add GA
2013-11-23 13:47:27 -08:00
23bdbd6fd8
synced_folders/nfs: specify nfs_udp false to disable udp [GH-2304]
2013-11-23 13:43:48 -08:00
1b8c3b62af
core: scope hash override synced folder settings
2013-11-23 13:38:15 -08:00
de9d38de21
core: don't load vagrantfile on plugin command
2013-11-23 13:25:33 -08:00
d0f08b1f23
website/docs: add book link
2013-11-23 12:59:06 -08:00
e9fd622406
core: vagrant version requirements in vagrantfile [GH-2322]
2013-11-23 12:23:34 -08:00
bf72c7cb5d
core: human friendly error for corrupt box metadata
2013-11-23 11:54:42 -08:00
79d929a264
Update CHANGELOG
2013-11-23 11:47:29 -08:00
88425f0146
Merge pull request #2390 from borgstrom/master
...
core: allow owner & group to be supplied as an Integer and skip lookup
2013-11-23 11:46:50 -08:00
a4fe547536
Merge pull request #2444 from tmatilai/debian_hostname_fix
...
guests/debian: Fix hostname setting also in Debian, part N
2013-11-23 11:45:38 -08:00
aed61291e8
Update CHANGELOG
2013-11-23 11:45:06 -08:00
4e75e39ee5
Merge pull request #2426 from tmatilai/virtualbox_memory
...
providers/virtualbox: Add shortcut for setting the memory size for VirtualBox VM
2013-11-23 11:44:13 -08:00
47c01454f9
Merge pull request #2417 from BlackIkeEagle/vagrant-vim-settings
...
.vimrc with vagrant tabstop settings
2013-11-23 11:42:31 -08:00
8fa3a4f3e0
Update CHANGELOG
2013-11-23 11:42:04 -08:00
c49a4d6a1f
Merge pull request #2445 from tmatilai/debug_cli_option
...
core: Add `--debug` option as a shortcut for `VAGRANT_LOG=debug`
2013-11-23 11:41:20 -08:00
4e22e080d1
Update CHANGELOG
2013-11-23 11:40:44 -08:00
5b71cf87f3
Merge pull request #2450 from onejli/master
...
guests/redhat: ifdown ethN before munging ifcfg-ethN
2013-11-23 11:40:02 -08:00
05e9dc6e59
Update CHANGELOG
2013-11-23 11:36:20 -08:00
dcf57bd2cc
guests/linux: increase sleep time btween NFS mount retries
2013-11-23 11:35:27 -08:00
52c27cd498
Merge pull request #2448 from rimckenn/patch-1
...
hosts/bsd: don't set both maproot and mapall
2013-11-23 11:34:27 -08:00
0166e26990
Merge pull request #2460 from jeremyfelt/patch-1
...
website/docs: Add CentOS 'testing' argument for install_type
2013-11-23 11:26:59 -08:00
c6e2de712a
Update CHANGELOG
2013-11-23 11:26:27 -08:00
9362063623
Merge pull request #2487 from hatsuseno/master
...
hosts/gentoo: Restart NFS on Gentoo host instead of starting [GH-2487]
2013-11-23 11:25:42 -08:00
c00b045f53
providers/virtualbox: retry suspended check [GH-2479]
2013-11-23 11:20:22 -08:00
d554cfc4e0
Merge pull request #2521 from isaoshimizu/fix_nic_name_on_fedora
...
guests/fedora: fix network interface name on fedora. issue #2520
2013-11-23 11:06:26 -08:00
33273ee561
Merge pull request #2529 from markpeek/markpeek-freebsd-nobashshell
...
guests/freebsd: Allow the FreeBSD plugin to install without bash [GH-2485]
2013-11-23 11:04:29 -08:00
b02d0d52a7
Update CHANGELOG
2013-11-23 10:53:21 -08:00
14faccfd79
Merge branch 'pluggable-synced-folder'
...
This enables synced folder implementations to be completely standalone
plugins and simplifies the way synced folders are enabled for providers
by providing a standard `SyncedFolder` middleware that does everything.
This is all much better tested than previously.
The built-in synced folder types are now:
* "virtualbox" - VirtualBox shared folders
* "nfs" - NFS shared folders
These can now easily be extended
2013-11-23 10:51:34 -08:00
39715eb2ff
core: fix templates syntax error
2013-11-23 10:50:54 -08:00
0425d1712b
synced_folders/nfs: config goes here
2013-11-23 10:49:51 -08:00
ab70dc271b
core: verify explicit sf types are usable
2013-11-23 10:47:06 -08:00
2c8b6ace7f
providers/virtualbox: output UI
2013-11-22 19:33:17 -08:00
803e78a5d4
fixing error in comment #2333
2013-11-23 10:18:59 +08:00
0b9861db7d
providers/virtualbox: fix broken NFS check
2013-11-22 17:29:35 -08:00
850c9ea7a6
kernel: handle new NFS types
2013-11-22 17:22:47 -08:00
22a5430068
synced_folders/nfs: use proper error classes
2013-11-22 17:18:08 -08:00
be6d4cc116
providers/virtualbox: make sure sf host paths are strings
2013-11-22 17:16:21 -08:00
35ac7da5a0
providers/virtualbox: don't use NFS middleware anymore
2013-11-22 17:13:53 -08:00
125584aaf4
core: SyncedFolders middleware passes inoptions
2013-11-22 17:13:14 -08:00
079ac12f5d
core: remove NFS action
2013-11-22 16:53:17 -08:00
52fe93cc41
synced_folders/nfs: begin implementation (not functional)
2013-11-22 16:51:55 -08:00
9d3818a380
providers/virtualbox: use new SyncedFolders middleware
2013-11-22 16:21:14 -08:00
93a4066339
core: SyncedFolders built-in middleware
2013-11-22 16:12:51 -08:00
d5dcf84d62
Allow the FreeBSD plugin to install without bash [GH-2485]
...
The default shell is "bash -l" which does not get installed by default
on FreeBSD. This change allows the plugin to override the default shell
and use a known installed shell (sh).
2013-11-22 15:30:12 -08:00
a80de51054
Fixes recommended by phinze for #2333
2013-11-22 11:55:17 +08:00
Mitchell Hashimoto
elliotsegler
Mark Peek