Commit Graph

8452 Commits

Author SHA1 Message Date
Jon Topper 7ba398ead8 Add --no-delete to 'snapshot pop' command
In our test environments, it's good to be able to roll back to the same,
anonymous, snapshot repeatedly.  This patch adds a `--no-delete` option
to the `snapshot pop` command allowing this.

This makes the new core snapshot behaviour more consistent with what we
were doing with vagrant-multiprovider-snap
(https://github.com/scalefactory/vagrant-multiprovider-snap)
2016-01-15 18:21:47 +00:00
Seth Vargo af40b0e628 Merge pull request #6874 from theengineear/update-nfs-docs
Update nfs docs
2016-01-14 16:19:25 -05:00
Andrew Seier 74d28ed3c2 Backslash-escape `*` character. 2016-01-14 13:14:39 -08:00
Andrew Seier 809000439d Add note about using `visudo` to edit `sudoers`. 2016-01-14 13:09:43 -08:00
Gilles Cornu d518f712db Merge pull request #6800 from mitchellh/gildegoma/ansible-bug-fixes
provisioners/ansible_local: bug fixes

Resolve #6740, #6757, and #6793
2016-01-14 00:27:56 +01:00
Gilles Cornu e5e5057a06 update CHANGELOG for GH-6793 2016-01-14 00:12:24 +01:00
Gilles Cornu c2c1a443fd Merge commit 'refs/pull/upstream/6869' into gildegoma/ansible-bug-fixes
Fix #6793
2016-01-14 00:05:33 +01:00
Daniel Schreiber 9dbdb9397a fixing incorrect missing ansible error
At least for ansible 2.0.0.1 the command `ansible-galaxy --help` is inappropriate for testing if ansible is installed, as it yields an error:

```
vagrant@vagrant-ubuntu-trusty-64:~$ ansible-galaxy --help && echo "OK"          
Usage: ansible-galaxy [delete|import|info|init|install|list|login|remove|search|setup] [--help] [options] ...

Options:
  -h, --help     show this help message and exit
  -v, --verbose  verbose mode (-vvv for more, -vvvv to enable connection
                 debugging)
  --version      show program's version number and exit
ERROR! Missing required action
```
2016-01-13 23:05:39 +01:00
Seth Vargo 54aa2f640a Grammar 2016-01-12 14:10:21 -05:00
Seth Vargo 5fbeddeeec Merge pull request #6795 from michaldo/master
#6794 Add to doc trick how to define locale for SSH session in Vagrant
2016-01-12 14:08:55 -05:00
Mitchell Hashimoto f20764f6b8 Merge pull request #6844 from adamenger/patch-1
Unfortuantely -> Unfortunately
2016-01-10 22:07:41 -08:00
adamenger 5c25b8f569 Unfortuantely -> Unfortunately
spelling fix
2016-01-11 00:04:34 -06:00
Seth Vargo 0c4a623bee Clarify different channel types for Chef
Fixes GH-6767
2016-01-10 18:07:53 -06:00
Mitchell Hashimoto 005c9fb127 Merge pull request #6833 from anatol/patch-1
Specify gem license
2016-01-08 09:48:01 -08:00
Anatol Pomozov dd88edaeaf Specify gem license 2016-01-08 09:47:05 -08:00
Seth Vargo 1d3dbce813 Update README.md 2016-01-07 15:29:29 -05:00
Shawn Neal 13dfc9dfb7 Merge pull request #6816 from mitchellh/issue-6762
Fix issue 6762
2016-01-06 17:24:44 -05:00
Shawn Neal e1a0b01e27 Fix issue 6762
Fixes error "The term '$?' is not recognized as the name of a cmdlet, function, script"
2016-01-06 13:37:28 -08:00
Gilles Cornu 1e38be237e provisioners/ansible: fix galaxy paths on Windows
Close #6757 and update previous fix for #6740 (#6741).

See also these places where the same regexp is used to address similar
"Windows cases":

 - ec85548bd6/plugins/provisioners/chef/provisioner/chef_solo.rb (L99-L103)
 - ec85548bd6/plugins/guests/windows/cap/rsync.rb (L6-L9)
2016-01-05 08:22:10 +01:00
michal fdcf53b56d #6794 Add to doc trick how to define locale for SSH session in Vagrant
file
2016-01-04 21:58:02 +01:00
Seth Vargo d1d493c323 Merge pull request #6774 from aqnouch/patch-1
Updated copyright to 2016
2016-01-02 19:16:50 -05:00
AQNOUCH Mohammed 9dcf10115a Updated copyright to 2016 2016-01-01 01:29:10 +00:00
Seth Vargo 7daffabf9d Merge pull request #6771 from kriuz/patch-1
Update shell.html.md
2015-12-30 16:18:49 -05:00
kriuz c46f15882a Update shell.html.md
Fix sentence structure.
2015-12-30 13:17:45 -08:00
Seth Vargo 5fe4b6d877 Merge pull request #6756 from OmarIthawi/patch-1
Removed a tiny strange char `U+05BB`
2015-12-29 10:30:21 -05:00
Omar Al-Ithawi 21b908f469 Removed a tiny strange char `U+05BB`
http://www.fileformat.info/info/unicode/char/05bb/index.htm
2015-12-29 09:44:56 +02:00
Seth Vargo e2a52144d6 Merge pull request #6753 from sschuberth/master
docs: Clarify that VirtualBox is not the only shipped provider
2015-12-28 17:21:45 -05:00
Sebastian Schuberth 992d2d70e7 docs: Clarify that VirtualBox is not the only shipped provider 2015-12-28 22:57:40 +01:00
Gilles Cornu 9a5597e1a7 Update CHANGELOG.md
ref #6741, #6740
2015-12-27 22:15:11 +01:00
char16t 07f3d0b00d Fix #6740: Ansible local provisioner: remove windows drive letter from path 2015-12-27 12:01:45 +03:00
Mitchell Hashimoto 984bc4ab77 up version for dev 2015-12-24 14:03:36 -08:00
Mitchell Hashimoto a3b85662e2 website/www: update version for download 2015-12-24 14:03:12 -08:00
Mitchell Hashimoto c1c00e2f3c v1.8.1 2015-12-24 13:26:53 -08:00
Mitchell Hashimoto 609f83b69e website/docs: document workaround for SMB bad fs type [GH-6704] 2015-12-24 12:48:32 -08:00
Mitchell Hashimoto 72f60aff65 whitespace 2015-12-24 12:44:58 -08:00
Mitchell Hashimoto 02960dedf9 locales: add missing docker translation 2015-12-24 12:41:39 -08:00
Mitchell Hashimoto 45212a9b67 core: avoid crash case with nil [GH-6730] 2015-12-24 12:38:14 -08:00
Mitchell Hashimoto cf4b03d701 core: do not convert drive letters to UNC paths [GH-6598] 2015-12-24 12:36:14 -08:00
Mitchell Hashimoto 39543973f1 update CHANGELOG 2015-12-24 12:29:57 -08:00
Mitchell Hashimoto f1cc9d98bf Merge pull request #6731 from mitchellh/b-pinstall
Take into account machine index and forced provider for provider install
2015-12-24 12:29:21 -08:00
Mitchell Hashimoto 2d67b9ea3f commands/up: take into account forced provider 2015-12-24 12:27:38 -08:00
Mitchell Hashimoto 12b81600fb commands/up: check machine index for provider 2015-12-24 12:24:47 -08:00
Mitchell Hashimoto 0de44a116b core: use env var for bundle retries [GH-6705] 2015-12-24 12:16:12 -08:00
Mitchell Hashimoto 05c2d439ac hosts/*: fix virtualbox install exception [GH-6713] 2015-12-24 12:08:31 -08:00
Mitchell Hashimoto aba23205f7 website/docs: mention require_vesrion 2015-12-24 12:05:16 -08:00
Mitchell Hashimoto 7d79cfd055 Merge pull request #6706 from mitchellh/kikitux-patch-1
linked_clone if Vagrant::VERSION =~ /^1.8/
2015-12-24 12:04:30 -08:00
Mitchell Hashimoto 8e6c039cca Merge pull request #6718 from geerlingguy/patch-1
Fix typo in ansible_local documentation.
2015-12-24 12:04:06 -08:00
Mitchell Hashimoto 7133593a5f update CHANGELOG 2015-12-24 12:03:54 -08:00
Mitchell Hashimoto 0b83d54409 Merge pull request #6722 from KaffeJunky123/patch-1
Fix Docker provisioning for Debian/Jessie box
2015-12-24 12:03:21 -08:00
Seth Vargo 1bed5976ca Merge pull request #6728 from ianvanness/patch-1
Fixed typo
2015-12-24 10:47:23 -05:00