Max Lincoln
d6e91483a6
Merge branch 'master' of github.com:mitchellh/vagrant into winrmssl
...
Conflicts:
vagrant.gemspec
2015-02-09 11:10:23 -05:00
Seth Vargo
a755cf285a
Clarify first sentence about project setup
2015-02-09 09:40:20 -05:00
Schneider Werner-Walter
02c0bfafc6
Add Scientific Linux to RHEL 7 flavors.
2015-02-08 02:56:44 +02:00
cubetto
2e659bf12c
Update host_machine_build_dir.rb
2015-02-07 20:33:55 -03:00
Christopher Chan-Nui
a6361a750c
Copy linux support for insert_public_key and remove_public_key to solaris11.
2015-02-04 16:58:17 -06:00
Seth Vargo
b2c722ef54
Update CHANGELOG
2015-02-04 13:30:24 -05:00
Seth Vargo
2c88f7b7d9
Merge pull request #5283 from mitchellh/sethvargo/developed_on
...
Add extra metadata information to Atlas pushes
2015-02-04 13:29:41 -05:00
Seth Vargo
7d25a687ca
Add tests for sending metadata
2015-02-04 11:45:02 -05:00
Seth Vargo
257ff57772
Remove message for now
2015-02-03 21:06:51 -05:00
Seth Vargo
82b24e9a8f
Pass in a message to the command as well
2015-02-03 19:20:27 -05:00
Seth Vargo
d29a474fbb
Cleanup that syntax
2015-02-03 19:20:12 -05:00
Seth Vargo
0dde0b3756
Use a real iso env for push tests
2015-02-03 19:19:58 -05:00
Seth Vargo
edbc3e74d4
Pass metadata to push command
2015-02-03 19:19:51 -05:00
Seth Vargo
52d0df3296
Add --message option to `vagrant push`
2015-02-03 19:19:08 -05:00
Félix Bellanger
b776fe74b8
detect fedora 21
2015-02-03 10:23:35 +01:00
Mitchell Hashimoto
ef7cf679dc
Revet CHANGELOG
2015-02-03 06:40:16 +01:00
Mitchell Hashimoto
a0be121f4f
Revert "Merge pull request #5274 from mitchellh/sethvargo/atlas_api"
...
This reverts commit 7f19284ef4
, reversing
changes made to f0284d000b
.
2015-02-03 06:39:28 +01:00
Seth Vargo
bc7272b96d
Update CHANGELOG
2015-02-02 19:38:02 -05:00
Seth Vargo
7f19284ef4
Merge pull request #5274 from mitchellh/sethvargo/atlas_api
...
Use the new Atlas APIs for downloading boxes
2015-02-02 19:37:20 -05:00
Seth Vargo
6fd685e96d
Fix failing tests
2015-02-02 19:24:50 -05:00
Seth Vargo
bec0f28f40
Use the new Atlas APIs for downloading boxes
2015-02-02 18:14:21 -05:00
Seth Vargo
f0284d000b
Merge pull request #5272 from mitchellh/sethvargo/remove_box
...
Do not encourage users to download a box directly
2015-02-02 11:09:56 -05:00
Seth Vargo
fe312beef2
Do not encourage users to download a box directly
...
Instead of having the user download a .box file and manually installing it,
just use the hashicorp/precise64 box and let Vagrant handle the download.
2015-02-02 11:07:41 -05:00
Seth Vargo
c766a1fdae
Merge pull request #5264 from aknrdureegaesr/link-to-env-in-cli-doc
...
Make the environment variable documentation more easy to find.
2015-01-29 11:39:27 -05:00
Andreas Krüger
0501cd5500
Adding a link to the environment variable documentation to the cli documentation.
2015-01-29 17:26:54 +01:00
Seth Vargo
deadf816e1
Merge pull request #5257 from aknrdureegaesr/master
...
Kindly document how to disable checkpoint remote call.
2015-01-29 11:20:15 -05:00
Andreas Krüger
f2042c9cb3
Document how to disable remote call to https://checkpoint-api.hashicorp.com .
2015-01-29 17:15:17 +01:00
Blair Hamilton
7784ee2d09
Revert "Rename Windows guest without reboot"
2015-01-28 20:00:24 -05:00
Max Lincoln
39882957ee
Add retry_delay setting to speed up test
2015-01-28 13:41:07 -05:00
Max Lincoln
5d5e13bc0f
Change authorization error tests to match WinRM 1.3
2015-01-28 13:41:07 -05:00
Richard Guin
56a6c85e7d
Windows rsync needs to create folders before syncing
2015-01-28 13:07:36 -05:00
Max Lincoln
c37c12526a
Merge branch 'master' of github.com:mitchellh/vagrant into winrm_error_handling
...
Conflicts:
vagrant.gemspec
2015-01-28 10:44:47 -05:00
Shawn Neal
6378deacd6
Merge pull request #5225 from mitchellh/winrm-fs-dependency
...
Use winrm-fs for file uploads
2015-01-26 09:55:31 -08:00
Mitchell Hashimoto
37b60f54ea
Merge pull request #5244 from mitchellh/log-action-name
...
core: log action name to info
2015-01-24 14:17:32 -08:00
Paul Hinze
dfbcebef0b
core: log action name to info
...
I found this output to be very helpful in debugging an action hook
problem in a plugin. problem. I'm not sure why the callable_id is
useful (seem to always show up as an instance of `Builder` or `Warden`
for me), but I left it in there just in case it's useful to someone.
2015-01-24 09:59:48 -08:00
Seth Vargo
64f81af889
Merge pull request #5238 from dragon788/master
...
Updated wording around synced folder optional arguments
2015-01-22 15:31:54 -05:00
dragon788
f9a53a2c27
Clarified wording a little bit further
2015-01-22 14:16:44 -06:00
dragon788
259568f68a
Clarified multiple additional options are possible
...
Updated additional options section to clarify that multiple options can be specified, not just "a third" as originally suggested.
2015-01-22 13:44:14 -06:00
Paul Hinze
d023408f78
Update CHANGELOG
2015-01-21 17:25:55 -08:00
Paul Hinze
fa38b59049
Merge pull request #5233 from mitchellh/virtualbox-dhcpserver-netmask
...
providers/virtualbox: read netmask from dhcpservers
2015-01-21 17:11:09 -08:00
Seth Vargo
daeaf25858
Do no minify HTML on websites
2015-01-21 17:01:44 -05:00
Seth Vargo
96d1285b4f
Use 2014 for the license upgrade center URL
2015-01-21 16:55:28 -05:00
Seth Vargo
86d27528b3
Update CHANGELOG
2015-01-21 16:05:51 -05:00
Seth Vargo
3f95d5de9f
Merge pull request #5221 from simonvetter/svetter/fixBoxChecksums
...
fix checksum verification for downloaded boxes (fixes #4665 )
2015-01-21 16:05:07 -05:00
Simon Vetter
1bc364febc
add test for checksum options mapping
2015-01-21 21:40:25 +01:00
Paul Hinze
88ab9f7402
providers/virtualbox: read netmask from dhcpservers
...
This should fix the cleaning up of the default VirtualBox dhcpserver,
which we've been fighting with for ages over in #3083 . We were checking
for a structure _including_ a netmask, but the driver was not populating
netmask.
2015-01-21 10:51:39 -08:00
Seth Vargo
ce4525e7fd
Clean up words a bit
2015-01-21 10:26:27 -05:00
Seth Vargo
cc63ba34cb
Merge pull request #5230 from berendt/issue_5228
...
Add a note to the "external script" section how to run existing scripts
2015-01-21 10:25:37 -05:00
Christian Berendt
58435b7dca
Add a note to the "external script" section how to run existing scripts
...
Closes-bug: #5228
2015-01-21 16:22:10 +01:00
Max Lincoln
29845e926c
Merge branch 'master' into winrm_error_handling
2015-01-20 16:16:48 -05:00