8e8a834640
Merge pull request #3604 from lamont-granquist/lcg/fix-prerelease-versions
...
fix chef version checking
2014-05-01 19:46:52 -03:00
56a22db6e2
remove require
2014-05-01 15:34:34 -07:00
2c9f83a690
fix chef version checking
...
the version checking here uses a function which is intended only
for chef cookbook versions, which must be x.y or x.y.z. when fed
a legal chef prerelease version the prior code throws an exception:
[2014-05-01T22:08:01+00:00] FATAL: Configuration error Chef::Exceptions::InvalidCookbookVersion: '11.14.0.alpha.1' does not match 'x.y.z' or 'x.y'
[2014-05-01T22:08:01+00:00] FATAL: /tmp/vagrant-chef-2/solo.rb:6:in `from_string'
[2014-05-01T22:08:01+00:00] FATAL: Aborting due to error in '/tmp/vagrant-chef-2/solo.rb'
since we only need to compare the major and minor version numbers a
simple #to_f sufficies for this test.
alternative, we could use Gem::Version here, but i didn't really see
the need to...
2014-05-01 15:26:34 -07:00
1b698f6ce8
website/docs: Fix link to global-status command
2014-05-01 18:52:51 -03:00
d64c1f750c
website/docs: Add missing `end` to "Run Once or Always" example
2014-05-01 18:50:51 -03:00
736b6b1674
Update CHANGELOG
2014-05-01 13:49:41 -07:00
f6683ad016
website/docs: update slat docs
2014-05-01 13:49:12 -07:00
c303f82170
Merge pull request #3603 from eykd/feature/colorize-salt-output
...
provisioner/salt: Add colorization and log_level support to salt provisioner.
2014-05-01 13:47:44 -07:00
567af495d4
Add colorization and log_level support to salt provisioner.
...
This commit adds two new options to the salt provisioner:
- `colorize`: controls color output. Defaults to no-color (present behavior).
- `log_level`: controls log level. Defaults to `debug` (present behavior).
Docs included!
2014-05-01 11:10:09 -07:00
744c9c9663
providers/docker: choose proper provider for host VM
2014-05-01 10:22:43 -07:00
3ef77d395b
Update CHANGELOG
2014-05-01 10:19:51 -07:00
049e92056b
Merge pull request #3600 from mitchellh/f-default-provider
...
Default Provider By Priority
2014-05-01 10:19:09 -07:00
c5b3dbbf75
core: fix final test
2014-05-01 10:12:36 -07:00
169a829cd8
core: dup the provider options so we can't overwrite them
2014-05-01 10:06:03 -07:00
52bb68ba73
core: Fix some tests, revert a change
2014-05-01 10:03:49 -07:00
76e29b912f
providers/docker: lower priority
...
We do this mostly because Docker is the only provider that using it
requires some amount of Docker-specific knowledge. VirtualBox, VMware,
etc. kind of "just work". It is not the likely case that someone does
a `vagrant up` and expects Docker, at this point.
2014-05-01 09:51:50 -07:00
cca9bffa90
core: Can exclude providers
2014-05-01 09:50:35 -07:00
ab9f91568e
core: more intuitive logic around default providers
2014-05-01 09:46:40 -07:00
ba6272cc48
Update tests
2014-05-01 09:41:59 -07:00
a9dfb6b3bd
core: default provider chosen by usability and prority
2014-05-01 09:40:52 -07:00
429bd73495
core: provider has default priority of 5
2014-05-01 09:26:36 -07:00
b6a61d8922
Update CHANGELOG
2014-05-01 09:14:27 -07:00
2362e7d5f0
Merge pull request #3599 from mitchellh/deprecate-warnings-for-unused-halt-config-props
...
Display deprecation warning for unused halt config properties
2014-05-01 09:09:53 -07:00
c99a1fb2ae
Display deprecation warning for unused halt config properties
...
halt_timeout and halt_check_interval will be removed in the next version of Vagrant, 1.7.
2014-05-01 09:03:49 -07:00
6524a077e8
Merge pull request #3594 from aspiers/provider-config-doc-typo
...
website/docs: fix "necessarilly" typo
2014-05-01 08:37:39 -07:00
cde90b2432
Merge pull request #3595 from berendt/topy
...
website: fixed typos found by topy in all Markdown files
2014-05-01 08:31:53 -07:00
9dc2db5e5b
Merge pull request #3597 from mitchellh/update-website-docs-halt-timeout-default-value
...
website/docs: Updated website documentation for graceful_halt_timeout
2014-05-01 08:30:27 -07:00
c8652e1067
Merge pull request #3598 from mitchellh/remove-halt-timeout-from-windows-guest
...
guests/windows: Removed unused halt timeout and check interval settings.
2014-05-01 08:29:50 -07:00
f4b67df978
Removed unused halt timeout and check interval settings.
2014-05-01 08:00:41 -07:00
b57131a0ef
Updated website documentation for graceful_halt_timeout
...
The default value in the code is actually 60 seconds, so now the docs match that.
2014-05-01 07:56:09 -07:00
b05e506031
fixed typos found by topy in all Markdown files
...
Topy is available at https://github.com/intgr/topy .
2014-05-01 16:22:23 +02:00
8a465da594
fix "necessarilly" typo
2014-05-01 10:37:43 +01:00
ddc6853a4c
website/docs: global-status
2014-05-01 00:11:36 -07:00
97e2af2374
Merge pull request #3593 from mitchellh/elevated-winrm-shell-provisioner
...
provisioner/shell: Elevated winrm shell provisioner
2014-04-30 23:46:46 -07:00
cc905d7923
Fix remote/downloaded shell scripts
...
The temporary shell script that we downloaded the script too was being deleted twice, thus causing an error on the secondary delete.
2014-04-30 19:39:37 -07:00
392269a8eb
Default the WinRM shell provisioner to privileged (elevated)
2014-04-30 19:35:02 -07:00
490562f00a
website/docs: run once and always provisioners
2014-04-30 18:53:24 -07:00
1f2a06710f
website/docs: force flags on init and box remove
2014-04-30 18:50:00 -07:00
ac57af1b8e
website/docs: post_up_message
2014-04-30 18:48:39 -07:00
4a720bd096
website/docs: rdp command
2014-04-30 18:46:23 -07:00
097d4ec2ad
website/docs: docker commands
2014-04-30 18:46:22 -07:00
e29075c24a
website/docs: docker provider
2014-04-30 18:46:21 -07:00
cadd7f602c
Merge pull request #3592 from mitchellh/reboot-capability-should-fix-symlinks
...
guests/windows: reboot capability should fix symlinks
2014-04-30 17:46:46 -07:00
309f301a16
Added test to verify Windows symlinks to shares are fixed
2014-04-30 17:36:36 -07:00
068b5cf0b9
Move Windows symlink re-establishment after reboot into capability
...
This reduces the complexity and likelihood of provisioner bugs.
2014-04-30 17:36:36 -07:00
9c420b8738
providers/virtualbox: set proper mac address on priv net [GH-3588]
2014-04-30 17:09:29 -07:00
53939d0a47
Update travis, don't need to install custom Bundler
2014-04-30 15:34:47 -07:00
ed908a5ed3
Merge pull request #3587 from aspiers/bundler-1.6
...
add support for bundler >= 1.6.x
2014-04-30 15:34:12 -07:00
f80fdfa32a
privisoners/salt: proper bootstrap URL [GH-3583]
2014-04-30 15:32:20 -07:00
36e924b73e
add support for bundler >= 1.6.x
...
bundler changed their API for Bundler::UI in 1.6.0 via this commit:
https://github.com/bundler/bundler/commit/5e38e2d7
This caused various issues, e.g.
https://github.com/mitchellh/vagrant/issues/3451
https://github.com/test-kitchen/test-kitchen/issues/401
which will hopefully be resolved by teaching vagrant to cope with both
API versions.
2014-04-30 23:32:16 +01:00
Teemu Matilainen
Lamont Granquist
Fabio Rehm
Mitchell Hashimoto
deyk
Shawn Neal
Christian Berendt
Adam Spiers