Merge commit 'refs/pull/upstream/6869' into gildegoma/ansible-bug-fixes

Fix #6793

README.md

@@ -53,13 +53,11 @@ Ruby 2.0 is needed.
 
 ## Contributing to Vagrant
 
-### Dependencies and Unit Tests
+To install Vagrant from source, please [follow the guide in the Wiki](https://github.com/mitchellh/vagrant/wiki/Installing-Vagrant-from-Source).
 
-To hack on Vagrant, you'll need [bundler](https://github.com/bundler/bundler) which can
-be installed with a simple `gem install bundler`. Afterwards, do the following:
+You can run the test suite with:
 
-    bundle install
-    rake
+    bundle exec rake
 
 This will run the unit test suite, which should come back all green! Then you're good to go!
 

plugins/provisioners/ansible/provisioner/guest.rb

@@ -52,7 +52,7 @@ module VagrantPlugins
 
           # Check that ansible binaries are well installed on the guest,
           @machine.communicate.execute(
-            "ansible-galaxy --help && ansible-playbook --help",
+            "ansible-galaxy info --help && ansible-playbook --help",
             :error_class => Ansible::Errors::AnsibleNotFoundOnGuest,
             :error_key => :ansible_not_found_on_guest)
 

plugins/provisioners/puppet/provisioner/puppet.rb

@@ -230,7 +230,7 @@ module VagrantPlugins
           command = "#{facter} #{puppet_bin} apply #{options}"
           if config.working_directory
             if windows?
-              command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}"
+              command = "cd #{config.working_directory}; if ($?) \{ #{command} \}"
             else
               command = "cd #{config.working_directory} && #{command}"
             end

vagrant.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.authors       = ["Mitchell Hashimoto", "John Bender"]
   s.email         = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]
   s.homepage      = "http://vagrantup.com"
+  s.license       = 'MIT'
   s.summary       = "Build and distribute virtualized development environments."
   s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
 

website/docs/source/v2/provisioning/chef_common.html.md

@@ -41,7 +41,11 @@ their purpose.
   "chefdk", which will install the Chef Development Kit.
 
 - `channel` (string) - The release channel from which to pull the Chef Client
-  or the Chef Development Kit. The default value is `"current"`.
+  or the Chef Development Kit. The default value is `"current"` which will pull
+  ChefDK and the latest released version of Chef. For older versions, you may
+  need to change the channel to "stable". Because Chef Software floats the
+  versions that are contained in the channel, they may change and Vagrant is
+  unable to detect this.
 
 - `version` (string) - The version of Chef to install on the guest. If Chef is
   already installed on the system, the installed version is compared with the

website/docs/source/v2/vagrantfile/tips.html.md

@@ -47,3 +47,19 @@ every node will actually provision with the same text.
 
 This is an easy mistake to make, and Vagrant can't really protect against it,
 so the best we can do is mention it here.
+
+## Overwrite host locale in ssh session
+
+Usually, host locale environment variables are passed to guest. It may cause
+failures if the guest software do not support host locale. One possible solution
+is override locale in the `Vagrantfile`:
+
+<pre class="prettyprint">
+ENV["LC_ALL"] = "en_US.UTF-8"
+
+Vagrant.configure(2) do |config|
+  # ...
+end
+</pre>
+
+The change is only visible within the `Vagrantfile`.

website/www/source/vmware/index.html.erb

@@ -327,7 +327,7 @@ page_title: "VMware Vagrant Environments"
 						We do offer a 50% discount off the purchase of the other Vagrant
 						plugin for individual users and qualified candidates. Certain
 						restrictions do apply. Please <a href="mailto:support@hashicorp.com?subject=Multi-discount">email support</a>
-						to find out if you qualify. Unfortuantely we cannot retroactively
+						to find out if you qualify. Unfortunately we cannot retroactively
 						apply this discount, so please email support before making your
 						purchase.
 					</p>