5c64fa3d10
Update CHANGELOG
2013-09-04 17:19:43 -07:00
763bdc42f4
Merge pull request #1537 from wormzer/master
...
communicator/ssh: Additional proxy_command option
2013-09-04 17:18:59 -07:00
f82711259c
provisioners/all: report proper invalid keys [GH-2117]
2013-09-04 16:57:15 -07:00
d5f733b184
website/www: note compatible VMware versions
2013-09-04 16:57:15 -07:00
b381bc6103
Ignore only root Vagrantfile
2013-09-04 16:57:15 -07:00
0b80f845e6
Merge pull request #2120 from beporter/comment-typo-fixes
...
core: comment typo fixes
2013-09-04 16:03:09 -07:00
582364b5fa
Merge pull request #2122 from psi/docs-fixes
...
website/docs: add missing Vagrantfile docs
2013-09-04 15:55:30 -07:00
504d7a8acc
Add missing Vagrantfile docs
2013-09-04 18:51:56 -04:00
accff3689b
Comment typo fixes
...
Only comment changes.
Removed stray apostrophe from Util::Downloader.initialize() doc block. Corrected open => options for .download! description.
2013-09-04 14:37:17 -05:00
29fa57da6c
website/docs: clarify roles
2013-09-03 21:06:45 -07:00
0a9c3c73db
Merge pull request #2115 from erichelgeson/patch-1
...
website/docs: Clarify statement on role files with chef-solo
2013-09-03 21:04:21 -07:00
e335725106
Clarify statement on role files with chef-solo
2013-09-03 20:48:36 -05:00
56be8cb393
Update CHANGELOG
2013-09-03 14:09:58 -07:00
51bdae3b90
Merge pull request #2112 from markpeek/markpeek-file
...
Add a file provisioner
2013-09-03 14:09:10 -07:00
2b4c95630e
scripts: website_push_www
2013-09-03 13:49:27 -07:00
cef35c7e5a
website/www: add www.vagrantup.com
2013-09-03 13:48:55 -07:00
72b6fe6167
website/docs: bring in changes from docs.vagrantup.com
2013-09-03 11:59:49 -07:00
4b26766d78
Only ignore the root Gemfile.lock
2013-09-03 11:49:28 -07:00
fea9ede82b
website/docs: add .buildpacks file
2013-09-03 11:47:40 -07:00
edc6d71682
scripts: add website_push_docs
2013-09-03 11:37:54 -07:00
3e995f6565
guests/fedora: use PEERDNS=no in static [GH-2111]
2013-09-03 11:10:28 -07:00
d03110eaa3
website: add docs back to the main Vagrant repo
2013-09-03 11:08:28 -07:00
c158b4aff4
Add a file provisioner
...
Add a provisioner which will upload host files and directories to the
guest via the scp channel. This is useful for populating user specific
files into the guest. This is a rename from scpupload to file and updated
against master. [GH-1357]
2013-09-03 11:03:46 -07:00
3154669835
provisioners/shell: prefer "." over "::"
...
/cc @fgrehm
2013-09-03 10:44:16 -07:00
c752c37586
Merge branch 'shell-provisioner-remote-script' of https://github.com/fgrehm/vagrant into fgrehm-shell-provisioner-remote-script
...
Conflicts:
CHANGELOG.md
2013-09-03 10:40:24 -07:00
be25238381
core: Show what machine error messages are for [GH-1668]
2013-09-02 15:53:59 -07:00
896ae7b9ba
core: vagrant -v no longer loads Vagrantfile
2013-09-02 15:43:59 -07:00
d9d9264747
Update CHANGELOG
2013-09-02 15:31:22 -07:00
89ecb7850f
Merge branch 'more_ansible_options' of https://github.com/gildegoma/vagrant into gildegoma-more_ansible_options
...
Conflicts:
plugins/provisioners/ansible/provisioner.rb
2013-09-02 15:30:49 -07:00
7f0cbd8fea
core: Vagrant.has_plugin? to check if plugin installed [GH-1736]
2013-09-02 15:22:40 -07:00
bd90f54a55
Update CHANGELOG
2013-09-02 15:11:24 -07:00
154b32e561
Merge pull request #1745 from jheise/master
...
providers/virtualbox: static ip addresses on public networks
2013-09-02 15:10:33 -07:00
b8dc881792
commands/up: validate provision-with args [GH-1957]
2013-09-02 15:06:03 -07:00
e8d2e05c4e
Merge pull request #2077 from miurahr/exportfs
...
Improvement of Linux supports and NFS handling using exportfs
2013-09-02 14:52:59 -07:00
ac1404b9ac
commands/plugin: Add "update" subcommand
2013-09-02 09:31:26 -07:00
c95a68ed5d
commands/reload: dont' provision by default
2013-09-02 09:13:22 -07:00
a656a99654
communicators/ssh: remove use of nonexistent config
2013-09-02 09:11:39 -07:00
63d0400de7
kernel_v1: don't upgrade "max_tries" and "timeout" because they're gone
2013-09-02 09:09:39 -07:00
e2ddab532d
core: Don't provision after first `up` by default [GH-1776]
2013-09-02 09:03:46 -07:00
ab7cee1ae0
Merge pull request #2107 from fgrehm/remove-dead-code
...
core: Remove dead code from Guest
2013-09-01 13:47:18 -07:00
78ed85be47
Update CHANGELOG
2013-09-01 13:46:42 -07:00
7897de3fbd
guests/ubuntu: enable the new mount_nfs stuff
2013-09-01 13:46:09 -07:00
8bc01c7cb1
Merge pull request #1717 from toretore/master
...
guests/ubuntu: Emit Ubuntu Upstart 'vagrant-mounted' (regression)
2013-09-01 13:43:26 -07:00
77dd626341
guest: Remove dead code
2013-09-01 17:41:17 -03:00
b581936434
Bump version
2013-09-01 17:39:13 -03:00
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
Mitchell Hashimoto
JD Harrington
Brian Porter
Eric Helgeson
Mark Peek
Fabio Rehm