Mitchell Hashimoto
862331fbf0
Merge branch '1.4.3'
...
Conflicts:
CHANGELOG.md
lib/vagrant/version.rb
2014-01-02 10:16:52 -08:00
Mitchell Hashimoto
4f0eb9504c
v1.4.3
2014-01-02 10:16:06 -08:00
Mitchell Hashimoto
3fbaaa5acc
changelog for 1.4.3
2014-01-02 10:10:07 -08:00
Mitchell Hashimoto
3f2d3886b2
providers/virtualbox: fix package [GH-2739]
2014-01-02 10:09:05 -08:00
Mitchell Hashimoto
5843c869c2
Merge pull request #2742 from ryansb/FedoraDetection
...
Correctly detect fedora 19 and 20
2014-01-02 09:11:38 -08:00
Ryan S. Brown
23ce05d166
detect fedora 19 and 20
2014-01-02 11:09:11 -06:00
Mitchell Hashimoto
b5c2a8e570
Update changelog
2014-01-01 20:49:29 -08:00
Mitchell Hashimoto
437b186966
Merge pull request #2734 from seginoviax/funtoo
...
New guest: Funtoo
2014-01-01 20:48:46 -08:00
Fabio Rehm
f2aad2679e
🎆 New year! 🎆
2014-01-02 00:48:22 -02:00
Seginoviax
12176515da
Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840
2013-12-31 17:33:10 -08:00
Seginoviax
a4c74ea87a
Revert "Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840 "
...
This reverts commit 3559c08086
.
2013-12-31 17:12:19 -08:00
Mitchell Hashimoto
e02ff58dc4
up version for dev
2013-12-31 14:19:34 -08:00
Mitchell Hashimoto
ccce3957d9
website/www: 1.4.2
2013-12-31 14:15:41 -08:00
Mitchell Hashimoto
f9e418a92b
v1.4.2
2013-12-31 13:30:33 -08:00
Mitchell Hashimoto
35237442cc
Update CHANGELOG
2013-12-31 11:01:17 -08:00
Mitchell Hashimoto
7141be065a
Merge pull request #2674 from phinze/static-nfs-guest-ips
...
core: problems with using VirtualBox guest properties for reading NFS Guest IP
2013-12-31 11:00:23 -08:00
Mitchell Hashimoto
7f5c85cf20
provisioners/chef-solo: delete data bag secret [GH-2712]
2013-12-31 10:44:08 -08:00
Mitchell Hashimoto
54f4cffc00
providers/virtualbox: export after checking if package exists [GH-2380]
2013-12-31 08:45:56 -08:00
Mitchell Hashimoto
6cacb86817
core: undo last for now
2013-12-31 08:39:36 -08:00
Mitchell Hashimoto
619fe9a056
core: warn if no provider is specified that we can't check for it
2013-12-31 08:38:58 -08:00
Mitchell Hashimoto
d86efdb9be
core: box add fails early if box already exists [GH-2621]
2013-12-31 08:34:59 -08:00
Mitchell Hashimoto
13c8235963
core: correct some doc comments
2013-12-31 08:19:43 -08:00
Mitchell Hashimoto
8c03e48320
core: re-arrange some code to make things easier to read later
2013-12-31 08:18:26 -08:00
Seginoviax
3559c08086
Add funtoo guest support. Based heavily on https://github.com/mitchellh/vagrant/pull/1840
2013-12-31 00:54:32 -08:00
Mitchell Hashimoto
f89c4412b2
synced_folders/nfs: lock around sudo input [GH-2680]
2013-12-30 14:45:40 -08:00
Mitchell Hashimoto
757ad016b1
core: ctrl-c no longer raises trap-context exception
2013-12-30 12:42:21 -08:00
Mitchell Hashimoto
28720b181d
guests/ubuntu: remove mount_nfs cap
2013-12-30 08:12:10 -08:00
Paul Hinze
fc66ec1660
providers/virtualbox: allow and prefer static guest IPs for NFS
...
Since vbox guest properties are proving to be less reliable than we had
hoped, bring back the static config parsing mechanism for finding a
guest IP to hand to NFS. If we find a static IP (or set of IPs) we'll
use that instead of trying to probe guest properties.
This retains NFS support for DHCP interfaces while regaining the
reliability that we previously had when static IPs were required.
2013-12-28 17:01:08 -06:00
Mitchell Hashimoto
1af0377541
Update CHANGELOG
2013-12-28 14:13:36 -07:00
Mitchell Hashimoto
5d39cc381f
Merge pull request #2694 from tmatilai/plugin-json-errors
...
core: show more informative error if plugin.json parsing fails
2013-12-28 13:12:59 -08:00
Mitchell Hashimoto
0316665ad8
commands/plugin: use default version requirement
2013-12-28 14:10:57 -07:00
Mitchell Hashimoto
2145ffd8b9
Merge pull request #2693 from oalders/master
...
core: reduces use of split infinitives.
2013-12-28 12:59:21 -08:00
Mitchell Hashimoto
e403eb1525
Merge pull request #2697 from Ninjamoose/dockerCmdCorrection
...
website/docs: CMD command correction
2013-12-28 12:58:54 -08:00
Mitchell Hashimoto
8bab77bd23
Update CHANGELOG
2013-12-28 13:51:18 -07:00
Mitchell Hashimoto
35d4737553
Merge pull request #2705 from tmatilai/upstart-emit-nfs
...
Emit upstart event `vagrant-mounted` also on NFS mounts
2013-12-28 12:50:53 -08:00
Mitchell Hashimoto
9333f550e5
style
2013-12-28 13:49:43 -07:00
Mitchell Hashimoto
5146bc2696
Merge pull request #2713 from tmatilai/log_plugin_versions
...
core: log loaded plugin versions
2013-12-28 12:49:00 -08:00
Mitchell Hashimoto
2cf864e95b
hosts/bsd: check exports only if exports file exists [GH-2714]
2013-12-28 13:48:13 -07:00
Mitchell Hashimoto
7f78f18218
core: handle EOFError when checking checksum [GH-2716]
2013-12-28 13:45:36 -07:00
Mitchell Hashimoto
6e69f0542a
website/docs: document "create" option for synced folders [GH-2730]
2013-12-28 13:29:59 -07:00
Mitchell Hashimoto
3bb6e8a640
Merge pull request #2725 from MarcMeszaros/salt-i18n
...
provisioners/salt: provisioner missing error messages in localization file
2013-12-27 19:55:27 -08:00
Marc Meszaros
13ff159d8c
Fix salt provisioner error namespace to be more consistent with other provisioners
2013-12-27 22:38:44 -05:00
Marc Meszaros
194d7d11cd
Add error messages to localization file for salt provisioner
2013-12-27 22:37:54 -05:00
Teemu Matilainen
42d156cce7
core: Log loaded plugin versions
...
One more piece of information to help support.
2013-12-23 18:23:30 -03:00
Teemu Matilainen
e3734a7a46
Merge pull request #2711 from marcellodesales/patch-1
...
Update base.html.md
2013-12-23 08:17:25 -08:00
Marcello de Sales
b41f4f59ef
Update base.html.md
...
Fixing the typo "Uesrs" in the section "Other Software" in the documentation v2...
2013-12-23 07:41:55 -08:00
Mitchell Hashimoto
594ea17003
Merge pull request #2707 from tobiasbaehr/patch-1
...
guests/debian: Docker: Set default value to avoid a prompt (lxc/directory)
2013-12-22 10:14:31 -08:00
Tobias Bähr
364488eba8
Set default value to avoid a prompt
2013-12-22 18:48:14 +01:00
Mitchell Hashimoto
9dca1c329a
Merge pull request #2706 from Ninir/patch-1
...
website/docs: Fixed typo in boxes/base.html.md
2013-12-22 07:45:45 -08:00
Ninir
e572e97b3e
Fixed typo in boxes/base.html.md
2013-12-22 15:45:02 +01:00