Commit Graph

10001 Commits

Author SHA1 Message Date
Brian Cain 17a8c157cb Update CHANGELOG 2017-06-28 08:42:22 -07:00
Brian Cain 0225d63055 Merge pull request #8722 from briancain/add-post-setup-proc-for-docker
Add post-install provisioner to docker provisioner
2017-06-28 08:32:23 -07:00
Chris Roberts f42279508d Reset plugin constraint on update if explicit version set 2017-06-28 07:24:32 -07:00
Chris Roberts f2fb2bafa8 Update CHANGELOG 2017-06-27 19:40:14 -07:00
Chris Roberts a2ce948f91 Merge pull request #8725 from chrisroberts/fix/windows-shellout
Rebuild command and arguments before exec on Windows
2017-06-27 19:39:21 -07:00
Chris Roberts 172ead5cbd Update CHANGELOG 2017-06-27 19:38:19 -07:00
Chris Roberts 911340442a Merge pull request #8692 from chrisroberts/update/gem-dep-constraints
Support strict enforcement of internal dependency constraints
2017-06-27 19:37:22 -07:00
Chris Roberts d1a589c59f Merge pull request #8724 from chrisroberts/fix/windows-cwd-check
Set encoding when reading/writing cwd file
2017-06-27 19:21:16 -07:00
Chris Roberts 73d85bd2f7 Support strict enforcement of internal dependency constraints 2017-06-27 19:20:20 -07:00
Chris Roberts 7776b0f864 Update CHANGELOG 2017-06-27 19:15:55 -07:00
Chris Roberts d346c7e666 Merge pull request #8729 from chrisroberts/bundler/system-plugin-constraints
Adjustments to internal plugin handling
2017-06-27 19:14:33 -07:00
Chris Roberts f341945a29 Include debug logging of string conversions 2017-06-27 19:10:18 -07:00
Chris Roberts 85d5f11f62 Adjustments to handle plugin updates using proper constraints
If a user provides the gem version using an explicit version or a
constraint, the update action should honor that constraint and not
simply replace it with an unbound constraint.

This also removes system plugin specifications from being matched
and preferred which prevents updates and can result in unexpected
downgrades when running the update.
2017-06-27 19:05:30 -07:00
Chris Roberts 97715280c2 Deep merge plugin list with system plugins. Discard specifications correctly. 2017-06-27 19:05:30 -07:00
Chris Roberts f45bd527e1 Merge pull request #8728 from armon/patch-1
Update index.html.erb
2017-06-27 16:34:28 -07:00
Armon Dadgar f9f8ae7c83 Update index.html.erb
Fixing the Vagrant Cloud link
2017-06-27 16:28:59 -07:00
Brian Cain a05d95bd0a (#7139) Add post-install provisioner to docker provisioner
Prior to this commit, if a user attempted to configure
`/etc/default/docker` through vagrant prior to installation, the package
manager would not override an existing configuration and installing
docker would then fail. This commit fixes this by introducing a
`post_install_provisioner` that allows users to define a provisioner
block that will run after docker has been installed, allowing users to
configure `/etc/default/docker` how they want.
2017-06-27 16:01:23 -07:00
Chris Roberts eb9ed1b39e Update wording as machine rename is not always required 2017-06-27 13:36:42 -07:00
Chris Roberts 2575ed9dc2 Explicitly set encodings to prevent incompatible string comparisons 2017-06-26 20:00:43 -07:00
Chris Roberts f3daf5fad7 Rebuild command and arguments before exec on Windows
Flat command can cause issues with arguments. Creating new
string instances from arguments forces common encoding of
all strings used for exec.

Fixes #8690
2017-06-26 20:00:06 -07:00
Chris Roberts 465c1c42e2 Merge pull request #8720 from JarvusInnovations/master
Update middleman-hashicorp to 0.3.28 for mega nav fixes
2017-06-26 19:19:55 -07:00
Chris Roberts 138408ab7c Merge pull request #8710 from chrisroberts/enhancement/atlas-to-vc
Updates for Vagrant Cloud
2017-06-26 16:43:44 -07:00
Ryon Coleman cb7fa43ff1 Update middleman-hashicorp to 0.3.28 for mega nav fixes
Fixes detailed at https://github.com/hashicorp/middleman-hashicorp/pull/47
2017-06-26 16:18:42 -04:00
Chris Roberts c5db5ea1c8 Update CHANGELOG 2017-06-23 14:02:51 -07:00
Chris Roberts 3e051ee185 Merge pull request #8706 from lookfwd/fix_bug_8705
Fixing vagrant ssh issue 8705 - vagrant ssh with docker provider failing
2017-06-23 14:01:34 -07:00
Chris Roberts 00ba45bc54 Update Enterprise to Cloud 2017-06-23 10:01:51 -07:00
Chris Roberts 5f955c3d38 Convert atlas references to vagrant cloud 2017-06-23 10:01:51 -07:00
Brian Cain 238ac6c4e2 Update CHANGELOG 2017-06-22 13:56:42 -07:00
Brian Cain c4eb18eb1a Merge pull request #8707 from briancain/disable-double-config-loading
Disable loading identical Vagrantfile twice from same dir
2017-06-22 13:55:19 -07:00
Brian Cain 57427d28e7 Merge pull request #8702 from briancain/maint/fix-ssh-util-unit-tests
Fixup util/ssh unit tests
2017-06-22 13:54:57 -07:00
Brian Cain 4ac55df22e Merge pull request #8708 from briancain/add-box-info-docs
Add information about extra box info
2017-06-22 13:54:11 -07:00
Brian Cain eec20a6506 Add information about extra box info
This commit adds a new page to vagrants docs around supplying an
`info.json` file for vagrant boxes.
2017-06-22 13:45:05 -07:00
Brian Cain 774e19b152 Disable loading identical Vagrantfile twice from same dir
Prior to this commit, if a user set the env var VAGRANT_HOME to be the
same directory where the project home is, Vagrant would load that file
twice and merge its config. This caused various provisioner and other
provider blocks to unexpectedly run twice. This commit updates the
config loader to look and see if the `:root` and `:home` procs are
equal, and if so, removes the `:home` object so that it isn't loaded and
duplicated. This commit however does not prevent duplicate loading if an
identical Vagrantfile exists in the home and project dir if those
locations are different.
2017-06-22 09:04:21 -07:00
Dimitrios Kouzis-Loukas 34d8ffb9b2 Fixing vagrant ssh issue 8705
Fixing vagrant issue https://github.com/mitchellh/vagrant/issues/8705
2017-06-21 10:23:34 -04:00
Brian Cain d66122f84d Fixup util/ssh unit tests
This commit properly mocks out the ChildProcess library for testing the
`util/ssh` class when subprocess is enabled.
2017-06-20 16:43:11 -07:00
Chris Roberts 3e0ff14ecb Update CHANGELOG 2017-06-19 16:52:56 -07:00
Chris Roberts 8437dccca2 Merge pull request #8678 from caveman-dick/fixWindow2012R2Issue
Fixes #8677 - Detect the result of the has_vmcx_support.ps1 properly
2017-06-19 16:51:46 -07:00
Chris Roberts 8536619962 Update CHANGELOG 2017-06-19 16:46:04 -07:00
Chris Roberts b3365af4b8 Merge pull request #8666 from louy2/patch-1
Chomp lookup gid
2017-06-19 16:45:04 -07:00
Chris Roberts c5b3751a83 Properly handle exception raised when property does not exist 2017-06-19 14:04:57 -07:00
Brian Cain 09d9c7563a Merge pull request #8699 from briancain/maint/master/fix-cwd-warnings
Fix vagrant_cwd warnings
2017-06-19 13:28:00 -07:00
Brian Cain 1b4d7848bc Fix vagrant_cwd warnings
Prior to this commit, if a user ran a vagrant command within a subdir,
it would warn about the cwd changing which is not actually the case.
This commit adds an additional check to see if vagrant is being invoked
within a subdirectory so that it doesn't warn the user.
2017-06-19 13:05:26 -07:00
Chris Roberts a47fbdad1b Merge pull request #8694 from DAXaholic/fix-snapshot-subcmd-anchors
Use proper snapshot subcommand anchors
2017-06-19 09:56:37 -07:00
Aaron Kunz 6e2c6141d0 Use proper snapshot subcommand anchors 2017-06-16 20:43:12 +02:00
Yufan Lou b8bad54ad9 Fix nil case 2017-06-16 11:22:56 +08:00
Brian Cain 5333e60e2d Update CHANGELOG 2017-06-15 16:39:47 -07:00
Brian Cain fbda3af106 Merge pull request #8693 from briancain/7855/master/introduce-more-ssh-config-options
Introduce more ssh options for machines
2017-06-15 16:38:18 -07:00
Brian Cain b02f110cd8 (#7855) Introduce more ssh options for machines
This commit allows the user to configure two additional options that
were previously not configurable: Compression and DSAAuthentication.
Each config option is set as a boolean, and if left out of the config
will default to its previous behavior which is included and set to
"yes". If the user explicitly sets it to false, it will not be included
as an ssh option.
2017-06-15 16:29:53 -07:00
Chris Roberts 5b1e9f1c66 Update CHANGELOG 2017-06-15 16:02:30 -07:00
Chris Roberts d260fe7d38 Merge pull request #7865 from DavidWittman/7454-fix-salt-minion-id-config
Fix minion_id config for salt provisioner
2017-06-15 16:01:33 -07:00