haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8,685 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

8685 Commits

Author SHA1 Message Date
Seth Vargo d9a4736e1c Merge pull request #7352 from mitchellh/sethvargo/24 
Bump box resume delay to 24h
 2016-05-27 16:05:27 -04:00
Seth Vargo 2a02ceb870
Bump box resume delay to 24h 
This commit bumps the box resume delay time to 24h and makes it a
constant because I had a bugger of a time actually finding this in the
code :frowny:.

Fixes GH-7272
 2016-05-27 15:18:50 -04:00
Seth Vargo f8439869e7 Merge pull request #7349 from kcvajgf/synced-folder-id 
Documentation for synced_folder's 'id' argument
 2016-05-27 09:57:07 -04:00
kcvajgf 368db4e933 Add documentation for synced_folder's 'id' argument 2016-05-27 20:43:01 +08:00
Seth Vargo 06135e3d6e Merge pull request #7347 from dmerrick/patch-1 
Fixing second paragraph indentation and link.
 2016-05-26 15:35:01 -04:00
Dana Merrick f7fa88fe8b Fixing second paragraph indentation and link. 2016-05-26 11:32:21 -07:00
Seth Vargo d35e7c43f0 Merge pull request #7339 from Apophenia/patch-1 
Fix typo in list of action hooks
 2016-05-23 19:43:31 -04:00
Lyndsey M c6bfb19e24 Fix typo in list of action hooks 
Fixes misspelled word in `machine_action_up` description: 'caled' to 'called'
 2016-05-23 19:12:58 -04:00
Seth Vargo a26742fc27 Merge pull request #7334 from annag42/patch-1 
Update up.html.md
 2016-05-21 10:24:53 -04:00
annag 87fd8beef8 Update up.html.md 
s/created and interacting with/created and interacted with/
for grammatical correctness (parallel construction).
 2016-05-20 18:58:43 -07:00
Seth Vargo ee492629ac
Update CHANGELOG 2016-05-20 10:46:49 -04:00
Seth Vargo 08550b6888 Merge pull request #7108 from jtopper/fix_hyperv_status_exception 
HyperV: Reinstate compatibility with PowerShell 4
 2016-05-20 10:46:01 -04:00
Seth Vargo b384ff98a5
Trailing comma 2016-05-19 11:35:53 -04:00
Seth Vargo 1571879a4b
Update CHANGELOG 2016-05-19 11:34:50 -04:00
Seth Vargo 4bdeeee793 Merge pull request #7327 from thommay/support_solo_legacy 
Support Chef Solo local + legacy modes
 2016-05-19 11:34:15 -04:00
Thom May 693d4dd5f1
Support Chef Solo local + legacy modes 
Signed-off-by: Thom May <thom@may.lt>
 2016-05-19 15:27:17 +01:00
Seth Vargo f6db93d4be
Update CHANGELOG 2016-05-16 12:07:41 -04:00
Seth Vargo 938f8f384d Merge pull request #7110 from jtopper/hyperv_snapshots 
Add snapshot support to Hyper-V provider
 2016-05-16 12:06:51 -04:00
Seth Vargo e3c327b977
Fix typo 
Fixes GH-7315
 2016-05-14 11:28:36 -04:00
Jon Topper 0a7c20a93a Determine status behaviour based on PS version 2016-05-13 17:50:24 +01:00
Jon Topper 82438da8a7 Add docs detailing the rollback limitations. 2016-05-13 17:28:33 +01:00
Jon Topper df4caf0757 Add snapshots to Hyper-V driver 2016-05-13 16:58:08 +01:00
Seth Vargo c4fab86752 Merge pull request #7299 from tiemevanveen/patch-1 
Added 'vagrant reload' info on collision_error
 2016-05-10 11:58:44 +02:00
Tieme van Veen b8ca105602 Added 'vagrant reload' info on collision_error 2016-05-10 10:56:22 +02:00
Seth Vargo 788bd557c4 Merge pull request #7283 from hedinfaok/patch-1 
Adds instructions concerning Bundler versions
 2016-05-04 13:16:33 -05:00
Rob Eden d3fc42c0b2 Fixes incorrect preposition 2016-05-04 14:11:31 -04:00
Rob Eden b1e8506ab0 Replaces Bundler details with Wiki link 2016-05-04 14:08:35 -04:00
Rob Eden eed574b311 Adds instructions concerning Bundler versions 
Because Vagrant requires certain versions of Bundler in order to work properly, the correct version of Bundler must be installed manually.  I gathered this information from a couple of sources.

It's handy to have this information in this specific guide :)
 2016-05-03 18:06:18 -04:00
Seth Vargo f19e33524d
Enable enhanced link tracking 2016-05-02 15:49:59 -04:00
Gilles Cornu cdafc63a61 Docs: Fix statements about the ansible.cfg lookup 
Related to GH-7195

[ci skip]
 2016-04-24 20:27:23 +02:00
Gilles Cornu cf908d35e0 provisioners/ansible_local: Run galaxy from `provisioning_path` directory 
Since it is now possible to specify some Galaxy settings in an
`ansible.cfg` file, it makes sense to run `ansible-galaxy` from the
same working directory as `ansible-playbook` execution does.

See http://docs.ansible.com/ansible/intro_configuration.html#galaxy-settings
 2016-04-24 00:26:59 +02:00
Seth Vargo df231f2704 Merge pull request #7251 from mitchellh/sethvargo/referrer 
Do not allow referrer modification
 2016-04-22 23:26:29 -04:00
Seth Vargo 1eefad649b
Do not allow referrer modification 
http://mathiasbynens.github.io/rel-noopener/
 2016-04-22 23:24:42 -04:00
Gilles Cornu 327392d0fb Fix a CHANGELOG entry 
[ci skip]
 2016-04-21 00:37:31 +02:00
Gilles Cornu afb9af1549 Update CHANGELOG 
[ci skip]
 2016-04-21 00:34:19 +02:00
Gilles Cornu b6a3f0e8f1 Merge pull request #7103 from mitchellh/gildegoma/fix-6726 
ansible_local: use double quoting for 'extra-vars', 'limit' and 'start-at-task' options (except if defined via `raw_arguments` option)
 2016-04-21 00:29:43 +02:00
Gilles Cornu b2286388f0 provisioners/ansible: add basic config validators 
With this change, the `raw_arguments` and `raw_ssh_args` options are:
- STILL automatically converted as an Array when they are set a String
  (no behaviour change)
- rejected if they are not of Array data type otherwise

Additional Notes:
- the 'as_array' tiny helper has been removed since it was no longer
  used.
- there is for now no deeper validation (i.e. verifying that the Array
  elements are only *String* objects)
 2016-04-20 23:54:19 +02:00
Gilles Cornu ab036ddd0b provisioners/ansible: don't format raw_arguments 
With cb80286a4a, the helper function
stringify_ansible_playbook_command was also applied on the
`raw_arguments` content, which is not wanted. Given that users have used
the `raw_arguments` option as a workaround to avoid the bug GH-6726,
this new change ensure that any `--extra-vars` option passed as a raw
argument won't be additonally enquoted by the ansible_local
provisioner.

This change also improves the ansible remote provisioner verbose output,
but has no impact on its behaviour, which was already correct.

Note that this refactoring introduces some code duplications that are not
very elegant (see ansible_playbook_command_for_shell_execution in
host.rb and execute_ansible_playbook_from_host in base.rb). I hope we
can find a better implementation later, but it is good enough for now
since all these parts are covered by corresponding unit tests (the
`ansible_local` stuff being tested via the verbose output of the ansible
remote provisioner).
 2016-04-20 23:50:42 +02:00
Seth Vargo e04bce8607 Merge pull request #7239 from nickbyfleet/master 
Fixed typo: incorrect key name for environment_path option.
 2016-04-18 15:13:56 +05:30
Nicholas Byfleet cdb62d7977 Fixed typo: incorrect key name for environment_path option. 2016-04-18 16:16:57 +12:00
Seth Vargo 2c553290b8
Update CHANGELOG 2016-04-17 23:15:31 +05:30
Seth Vargo 6c01aaf6ab Merge pull request #7090 from mac2000/master 
hyperv differencing disk
 2016-04-17 23:14:29 +05:30
Seth Vargo 5728a7fe5d Update website deploy script 2016-04-12 20:10:57 +01:00
Seth Vargo 1df4060c49 Merge pull request #7223 from tKammy/update_bash_completion 
update bash completion(snapshot)
 2016-04-10 09:47:07 -04:00
Kammy 67c4de3b81 update bash completion(snapshot) 2016-04-10 12:44:01 +09:00
Seth Vargo 4157082bf3 Add more examples of installing local plugins 2016-04-08 10:38:25 -04:00
Seth Vargo bfac44aded Update CHANGELOG 2016-04-08 10:22:54 -04:00
Seth Vargo 2cabecbe7d Merge pull request #7219 from mitchellh/sethvargo/warn_envvar 
Print a warning when token and envvar are set
 2016-04-08 10:20:40 -04:00
Seth Vargo 2d0943b0ad Print a warning when token and envvar are set 
Fixes GH-7206
 2016-04-08 10:16:10 -04:00
Seth Vargo 42c5d98f60 Merge pull request #7216 from mitchellh/phinze/website-mime-types 
website: force mime-types for some assets on deploy
 2016-04-07 15:42:48 -04:00