From 1a6805d469528c80b94f9844c1498d45e0084121 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Mon, 15 Sep 2014 21:49:37 -0700
Subject: [PATCH 001/165] Use the more canonical require_relative to include
 files

---
 plugins/provisioners/puppet/plugin.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/puppet/plugin.rb b/plugins/provisioners/puppet/plugin.rb
index 362a1c421..4d2b74bbe 100644
--- a/plugins/provisioners/puppet/plugin.rb
+++ b/plugins/provisioners/puppet/plugin.rb
@@ -10,22 +10,22 @@ module VagrantPlugins
       DESC
 
       config(:puppet, :provisioner) do
-        require File.expand_path("../config/puppet", __FILE__)
+        require_relative "config/puppet"
         Config::Puppet
       end
 
       config(:puppet_server, :provisioner) do
-        require File.expand_path("../config/puppet_server", __FILE__)
+        require_relative "config/puppet_server"
         Config::PuppetServer
       end
 
       provisioner(:puppet) do
-        require File.expand_path("../provisioner/puppet", __FILE__)
+        require_relative "provisioner/puppet"
         Provisioner::Puppet
       end
 
       provisioner(:puppet_server) do
-        require File.expand_path("../provisioner/puppet_server", __FILE__)
+        require_relative "provisioner/puppet_server"
         Provisioner::PuppetServer
       end
     end

From 16870d72d1102ef3623a4269af2b87e37628f3bf Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 19 Oct 2014 21:28:38 -0700
Subject: [PATCH 002/165] Some work in progress environment support

---
 Vagrantfile                                   | 79 +++++++-----------
 plugins/provisioners/puppet/config/puppet.rb  | 69 +++++++++++++---
 .../provisioners/puppet/provisioner/puppet.rb | 80 ++++++++++++++++---
 templates/locales/en.yml                      | 11 +++
 vagrant.gemspec                               |  3 +-
 5 files changed, 171 insertions(+), 71 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 075157ed9..2dea5e123 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,54 +1,35 @@
-# This Vagrantfile can be used to develop Vagrant. Note that VirtualBox
-# doesn't run in VirtualBox so you can't actually _run_ Vagrant within
-# the VM created by this Vagrantfile, but you can use it to develop the
-# Ruby, run unit tests, etc.
 
-Vagrant.configure("2") do |config|
-  config.vm.box = "hashicorp/precise64"
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
 
-  ["virtualbox", "vmware_fusion", "vmware_workstation"].each do |provider|
-    config.vm.provider provider do |v, override|
-      v.memory = "1024"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.box = "centos7"
+
+  config.vm.define :centos7 do |centos7|
+    config.vm.network "private_network", ip: "192.168.11.3"
+    config.vm.hostname = "centos7"
+    # config.vm.network "public_network"
+    # config.ssh.forward_agent = true
+    config.vm.synced_folder "../puppet", "/puppet"
+
+    config.vm.provider "virtualbox" do |vb|
+      vb.gui = false
+      # Use VBoxManage to customize the VM. For example to change memory:
+      vb.customize ["modifyvm", :id, "--memory", "2048"]
     end
+
+    config.vm.provision "puppet" do |puppet|
+      puppet.environmentpath = "../puppet/environments"
+      puppet.environment = "testenv"
+    #  puppet.manifests_path = "../puppet/manifests"
+    #  puppet.manifest_file  = "site.pp"
+      puppet.module_path = [ "../puppet/modules/public", "../puppet/modules/private" ]
+   #   puppet.options = "--debug --verbose"
+    end
+
+    # Deprecated method:
+    #puppet apply --debug --verbose --modulepath '/puppet/modules/private:/puppet/modules/public:/etc/puppet/modules' 
+    #--manifestdir /tmp/vagrant-puppet-1/manifests --detailed-exitcodes /tmp/vagrant-puppet-1/manifests/site.pp 
+
   end
-
-  config.vm.provision "shell", inline: $shell
 end
-
-$shell = <<-CONTENTS
-MARKER_FILE="/usr/local/etc/vagrant_provision_marker"
-
-# Only provision once
-if [ -f "${MARKER_FILE}" ]; then
-  exit 0
-fi
-
-# Update apt
-apt-get update
-
-# Install basic dependencies
-apt-get install -y build-essential bsdtar curl
-
-# Install RVM
-su -l -c 'curl -L https://get.rvm.io | bash -s stable' vagrant
-
-# Add the vagrant user to the RVM group
-#usermod -a -G rvm vagrant
-
-# Install some Rubies
-su -l -c 'rvm install 2.1.1' vagrant
-su -l -c 'rvm --default use 2.1.1' vagrant
-
-# Output the Ruby version (for sanity)
-su -l -c 'ruby --version' vagrant
-
-# Install Git
-apt-get install -y git
-
-# Automatically move into the shared folder, but only add the command
-# if it's not already there.
-grep -q 'cd /vagrant' /home/vagrant/.bash_profile || echo 'cd /vagrant' >> /home/vagrant/.bash_profile
-
-# Touch the marker file so we don't do this again
-touch ${MARKER_FILE}
-CONTENTS
diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 3117f9f6f..cc028b8db 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -10,6 +10,8 @@ module VagrantPlugins
         attr_accessor :hiera_config_path
         attr_accessor :manifest_file
         attr_accessor :manifests_path
+        attr_accessor :environment
+        attr_accessor :environmentpath
         attr_accessor :module_path
         attr_accessor :options
         attr_accessor :synced_folder_type
@@ -22,6 +24,8 @@ module VagrantPlugins
           @hiera_config_path = UNSET_VALUE
           @manifest_file     = UNSET_VALUE
           @manifests_path    = UNSET_VALUE
+          @environment       = UNSET_VALUE
+          @environmentpath   = UNSET_VALUE
           @module_path       = UNSET_VALUE
           @options           = []
           @facter            = {}
@@ -45,24 +49,45 @@ module VagrantPlugins
         def merge(other)
           super.tap do |result|
             result.facter  = @facter.merge(other.facter)
+            result.environmentpath  = @facter.merge(other.environmentpath)
+            result.environment  = @facter.merge(other.environment)
           end
         end
 
         def finalize!
           super
 
-          if @manifests_path == UNSET_VALUE
-            @manifests_path = [:host, "manifests"]
-          end
+          if @environmentpath == UNSET_VALUE
+            if @manifests_path == UNSET_VALUE
+              if 1  #If puppet 3.4+
+              puts "Puppet 3.4+, manifests_path is unset and environmentpath is unset, presuming an environment"
+                @environmentpath = [:host, "environments"]
+              else
+                @manifests_path = [:host, "manifests"]
+              end
+            end
 
-          if @manifests_path && !@manifests_path.is_a?(Array)
-            @manifests_path = [:host, @manifests_path]
+            if @manifests_path && !@manifests_path.is_a?(Array)
+              @manifests_path = [:host, @manifests_path]
+            end
+          else
+            if @environmentpath && !@environmentpath.is_a?(Array)
+              @environmentpath = [:host, @environmentpath]
+            end
           end
 
-          @manifests_path[0] = @manifests_path[0].to_sym
-
           @hiera_config_path = nil if @hiera_config_path == UNSET_VALUE
-          @manifest_file  = "default.pp" if @manifest_file == UNSET_VALUE
+
+          if @environmentpath == UNSET_VALUE
+            @manifests_path[0] = @manifests_path[0].to_sym
+            @environmentpath = nil
+            @manifest_file  = "default.pp" if @manifest_file == UNSET_VALUE
+          else
+            @environmentpath[0] = @environmentpath[0].to_sym
+            @environment  = "production" if @environment == UNSET_VALUE
+            @manifest_file = nil
+          end
+
           @module_path    = nil if @module_path == UNSET_VALUE
           @synced_folder_type = nil if @synced_folder_type == UNSET_VALUE
           @temp_dir       = nil if @temp_dir == UNSET_VALUE
@@ -96,8 +121,13 @@ module VagrantPlugins
           # Calculate the manifests and module paths based on env
           this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
 
+          if environmentpath != UNSET_VALUE && manifests_path != UNSET_VALUE
+              errors << "You may not specify both environmentpath and manifests_path. Please specify environment and environmentpath only"
+          end
+
           # Manifests path/file validation
-          if manifests_path[0].to_sym == :host
+          puts "manifests_path is #{manifests_path}"
+          if manifests_path != UNSET_VALUE && manifests_path[0].to_sym == :host
             expanded_path = Pathname.new(manifests_path[1]).
               expand_path(machine.env.root_path)
             if !expanded_path.directory?
@@ -110,8 +140,29 @@ module VagrantPlugins
                                  manifest: expanded_manifest_file.to_s)
               end
             end
+          end          
+
+          # Environments path/file validation
+          if environmentpath != UNSET_VALUE && environmentpath[0].to_sym == :host
+            expanded_path = Pathname.new(environmentpath[1]).
+              expand_path(machine.env.root_path)
+            if !expanded_path.directory?
+              errors << I18n.t("vagrant.provisioners.puppet.environmentpath_missing",
+                               path: expanded_path.to_s)
+            else
+              expanded_environment_file = expanded_path.join(environment)
+              if !expanded_environment_file.file? && !expanded_environment_file.directory?
+                errors << I18n.t("vagrant.provisioners.puppet.environment_missing",
+                                 environment: environment.to_s,
+                                 environmentpath: expanded_path.to_s)
+              end
+            end
           end
 
+          if environmentpath == UNSET_VALUE && manifests_path == UNSET_VALUE
+              errors << "Please specify either a Puppet environmentpath + environment (preferred) or manifests_path (deprecated)."
+          end          
+
           # Module paths validation
           this_expanded_module_paths.each do |path|
             if !path.directory?
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index f49316bf7..14b64087e 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -18,7 +18,6 @@ module VagrantPlugins
           # Calculate the paths we're going to use based on the environment
           root_path = @machine.env.root_path
           @expanded_module_paths   = @config.expanded_module_paths(root_path)
-          @manifest_file           = File.join(manifests_guest_path, @config.manifest_file)
 
           # Setup the module paths
           @module_paths = []
@@ -30,11 +29,23 @@ module VagrantPlugins
           folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type
           folder_opts[:owner] = "root" if !@config.synced_folder_type
 
-          # Share the manifests directory with the guest
-          if @config.manifests_path[0].to_sym == :host
-            root_config.vm.synced_folder(
-              File.expand_path(@config.manifests_path[1], root_path),
-              manifests_guest_path, folder_opts)
+          if @config.environmentpath.is_a?(Array)
+            # Share the environments directory with the guest
+            if @config.environmentpath[0].to_sym == :host
+              root_config.vm.synced_folder(
+                File.expand_path(@config.environmentpath[1], root_path),
+                environments_guest_path, folder_opts)
+            end
+            parse_environment_metadata()
+          else
+            # Non-Environment mode
+            @manifest_file  = File.join(manifests_guest_path, @config.manifest_file)
+            # Share the manifests directory with the guest
+            if @config.manifests_path[0].to_sym == :host
+              root_config.vm.synced_folder(
+                File.expand_path(@config.manifests_path[1], root_path),
+                manifests_guest_path, folder_opts)
+            end
           end
 
           # Share the module paths
@@ -43,6 +54,24 @@ module VagrantPlugins
           end
         end
 
+        # For convenience, add in any module_paths from the Puppet environment.cfg to the vagrant module_paths
+        # This is needed because puppet apply does not read environment metadata (as of v3.6)
+        def parse_environment_metadata
+          environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
+          if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
+            conf = @machine.communicate.sudo("cat #{environment_conf}") do | type, data|
+              if type == :stdout
+                #modulepath = $basemodulepath:modules/private:modules/public
+                puts "got line #{data}"
+              end
+            end
+            puts "Found an environment cfg at: #{environment_conf} - #{conf}"
+          else
+            puts "env cfg not found, looked for #{environment_conf}"
+          end
+        end
+
+
         def provision
           # If the machine has a wait for reboot functionality, then
           # do that (primarily Windows)
@@ -52,9 +81,12 @@ module VagrantPlugins
 
           # Check that the shared folders are properly shared
           check = []
-          if @config.manifests_path[0] == :host
+          if @config.manifests_path.is_a?(Array) && @config.manifests_path[0] == :host
             check << manifests_guest_path
           end
+          if @config.environmentpath.is_a?(Array) && @config.environmentpath[0] == :host
+            check << environments_guest_path
+          end
           @module_paths.each do |host_path, guest_path|
             check << guest_path
           end
@@ -92,6 +124,16 @@ module VagrantPlugins
           end
         end
 
+        def environments_guest_path
+          if config.environmentpath[0] == :host
+            # The path is on the host, so point to where it is shared
+            File.join(config.temp_dir, "environments")
+          else
+            # The path is on the VM, so just point directly to it
+            config.environmentpath[1]
+          end
+        end
+
         def verify_binary(binary)
           @machine.communicate.sudo(
             "which #{binary}",
@@ -125,10 +167,18 @@ module VagrantPlugins
             options << "--color=false"
           end
 
-          options << "--manifestdir #{manifests_guest_path}"
           options << "--detailed-exitcodes"
-          options << @manifest_file
+
+          if !config.environmentpath.empty?
+            options << "#{environments_guest_path}/#{@config.environment}/manifests"
+            options << "--environment #{@config.environment}"
+          else
+            options << "--manifestdir #{manifests_guest_path}"
+            options << @manifest_file
+          end
           options = options.join(" ")
+          
+          @machine.ui.info("Running ye puppet apply with options #{options}")
 
           # Build up the custom facts if we have any
           facter = ""
@@ -155,9 +205,15 @@ module VagrantPlugins
             end
           end
 
-          @machine.ui.info(I18n.t(
-            "vagrant.provisioners.puppet.running_puppet",
-            manifest: config.manifest_file))
+          if !config.environmentpath.empty?
+            @machine.ui.info(I18n.t(
+              "vagrant.provisioners.puppet.running_puppet_env",
+              environment: config.environment))
+          else
+            @machine.ui.info(I18n.t(
+              "vagrant.provisioners.puppet.running_puppet",
+              manifest: config.manifest_file))
+          end
 
           opts = {
             elevated: true,
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 4be7a92e7..2ec1d5c54 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1733,12 +1733,23 @@ en:
           installed on this guest. Puppet provisioning can not continue without
           Puppet properly installed.
         running_puppet: "Running Puppet with %{manifest}..."
+        running_puppet_env: "Running Puppet with environment %{environment}..."
         manifest_missing: |-
           The configured Puppet manifest is missing. Please specify a path to an
           existing manifest:
 
           %{manifest}
+        environment_missing: |-
+          The configured Puppet environment folder '%{environment}' was not found in the 
+          specified environmentpath %{environmentpath}.
+          Please specify a path to an existing Puppet directory environment.
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
+        manifest_missing: |-
+          The configured Puppet envrionment is missing. Please specify a path to an
+          existing envrionment file:
+
+          %{environment}
+        manifests_path_missing: "The environment path specified for Puppet does not exist: %{path}"
         missing_shared_folders: |-
           Shared folders that Puppet requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the
diff --git a/vagrant.gemspec b/vagrant.gemspec
index c4131b270..4a53983dc 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -15,7 +15,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant"
 
-  s.add_dependency "bundler", ">= 1.5.2", "< 1.7.0"
+  s.add_dependency "bundler", ">= 1.5.2"
+#, "< 1.7.0"
   s.add_dependency "childprocess", "~> 0.5.0"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "i18n", "~> 0.6.0"

From 3321a6da117b050713a6f250aa18b91a3e985352 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 19 Oct 2014 21:34:54 -0700
Subject: [PATCH 003/165] Make environment path param more canonical with an
 underscore

---
 Vagrantfile                                  |  2 +-
 plugins/provisioners/puppet/config/puppet.rb | 56 ++++++++++----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2dea5e123..0f5f34c66 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -19,7 +19,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
 
     config.vm.provision "puppet" do |puppet|
-      puppet.environmentpath = "../puppet/environments"
+      puppet.environment_path = "../puppet/environments"
       puppet.environment = "testenv"
     #  puppet.manifests_path = "../puppet/manifests"
     #  puppet.manifest_file  = "site.pp"
diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index cc028b8db..a6140b037 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -11,7 +11,7 @@ module VagrantPlugins
         attr_accessor :manifest_file
         attr_accessor :manifests_path
         attr_accessor :environment
-        attr_accessor :environmentpath
+        attr_accessor :environment_path
         attr_accessor :module_path
         attr_accessor :options
         attr_accessor :synced_folder_type
@@ -21,17 +21,17 @@ module VagrantPlugins
         def initialize
           super
 
-          @hiera_config_path = UNSET_VALUE
-          @manifest_file     = UNSET_VALUE
-          @manifests_path    = UNSET_VALUE
-          @environment       = UNSET_VALUE
-          @environmentpath   = UNSET_VALUE
-          @module_path       = UNSET_VALUE
-          @options           = []
-          @facter            = {}
+          @hiera_config_path  = UNSET_VALUE
+          @manifest_file      = UNSET_VALUE
+          @manifests_path     = UNSET_VALUE
+          @environment        = UNSET_VALUE
+          @environment_path   = UNSET_VALUE
+          @module_path        = UNSET_VALUE
+          @options            = []
+          @facter             = {}
           @synced_folder_type = UNSET_VALUE
-          @temp_dir          = UNSET_VALUE
-          @working_directory = UNSET_VALUE
+          @temp_dir           = UNSET_VALUE
+          @working_directory  = UNSET_VALUE
         end
 
         def nfs=(value)
@@ -49,7 +49,7 @@ module VagrantPlugins
         def merge(other)
           super.tap do |result|
             result.facter  = @facter.merge(other.facter)
-            result.environmentpath  = @facter.merge(other.environmentpath)
+            result.environment_path  = @facter.merge(other.environment_path)
             result.environment  = @facter.merge(other.environment)
           end
         end
@@ -57,11 +57,11 @@ module VagrantPlugins
         def finalize!
           super
 
-          if @environmentpath == UNSET_VALUE
+          if @environment_path == UNSET_VALUE
             if @manifests_path == UNSET_VALUE
               if 1  #If puppet 3.4+
-              puts "Puppet 3.4+, manifests_path is unset and environmentpath is unset, presuming an environment"
-                @environmentpath = [:host, "environments"]
+              puts "Puppet 3.4+, manifests_path is unset and environment_path is unset, presuming an environment"
+                @environment_path = [:host, "environments"]
               else
                 @manifests_path = [:host, "manifests"]
               end
@@ -71,19 +71,19 @@ module VagrantPlugins
               @manifests_path = [:host, @manifests_path]
             end
           else
-            if @environmentpath && !@environmentpath.is_a?(Array)
-              @environmentpath = [:host, @environmentpath]
+            if @environment_path && !@environment_path.is_a?(Array)
+              @environment_path = [:host, @environment_path]
             end
           end
 
           @hiera_config_path = nil if @hiera_config_path == UNSET_VALUE
 
-          if @environmentpath == UNSET_VALUE
+          if @environment_path == UNSET_VALUE
             @manifests_path[0] = @manifests_path[0].to_sym
-            @environmentpath = nil
+            @environment_path = nil
             @manifest_file  = "default.pp" if @manifest_file == UNSET_VALUE
           else
-            @environmentpath[0] = @environmentpath[0].to_sym
+            @environment_path[0] = @environment_path[0].to_sym
             @environment  = "production" if @environment == UNSET_VALUE
             @manifest_file = nil
           end
@@ -121,8 +121,8 @@ module VagrantPlugins
           # Calculate the manifests and module paths based on env
           this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
 
-          if environmentpath != UNSET_VALUE && manifests_path != UNSET_VALUE
-              errors << "You may not specify both environmentpath and manifests_path. Please specify environment and environmentpath only"
+          if environment_path != UNSET_VALUE && manifests_path != UNSET_VALUE
+              errors << "You may not specify both environment_path and manifests_path. Please specify environment and environment_path only"
           end
 
           # Manifests path/file validation
@@ -143,24 +143,24 @@ module VagrantPlugins
           end          
 
           # Environments path/file validation
-          if environmentpath != UNSET_VALUE && environmentpath[0].to_sym == :host
-            expanded_path = Pathname.new(environmentpath[1]).
+          if environment_path != UNSET_VALUE && environment_path[0].to_sym == :host
+            expanded_path = Pathname.new(environment_path[1]).
               expand_path(machine.env.root_path)
             if !expanded_path.directory?
-              errors << I18n.t("vagrant.provisioners.puppet.environmentpath_missing",
+              errors << I18n.t("vagrant.provisioners.puppet.environment_path_missing",
                                path: expanded_path.to_s)
             else
               expanded_environment_file = expanded_path.join(environment)
               if !expanded_environment_file.file? && !expanded_environment_file.directory?
                 errors << I18n.t("vagrant.provisioners.puppet.environment_missing",
                                  environment: environment.to_s,
-                                 environmentpath: expanded_path.to_s)
+                                 environment_path: expanded_path.to_s)
               end
             end
           end
 
-          if environmentpath == UNSET_VALUE && manifests_path == UNSET_VALUE
-              errors << "Please specify either a Puppet environmentpath + environment (preferred) or manifests_path (deprecated)."
+          if environment_path == UNSET_VALUE && manifests_path == UNSET_VALUE
+              errors << "Please specify either a Puppet environment_path + environment (preferred) or manifests_path (deprecated)."
           end          
 
           # Module paths validation

From d33c7b4d7affd90834baa981fc6f6454f6542882 Mon Sep 17 00:00:00 2001
From: Fabian Ruff <fabian@progra.de>
Date: Mon, 27 Oct 2014 18:21:02 +0100
Subject: [PATCH 004/165] Add password to rdp_info hash

Any specific reason the password was omitted from the rdp_info hash?

Without the password in the rdp_info hash I see no way of figuring out the password in the rdp_client capability.
---
 plugins/commands/rdp/command.rb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/plugins/commands/rdp/command.rb b/plugins/commands/rdp/command.rb
index 156312dd2..ba6d4d453 100644
--- a/plugins/commands/rdp/command.rb
+++ b/plugins/commands/rdp/command.rb
@@ -69,7 +69,15 @@ module VagrantPlugins
           end
           rdp_info[:username] = username
         end
-
+        
+        if !rdp_info[:password]
+          username = ssh_info[:password]
+          if machine.config.vm.communicator == :winrm
+            username = machine.config.winrm.password
+          end
+          rdp_info[:password] = username
+        end
+        
         rdp_info[:host] ||= ssh_info[:host]
         rdp_info[:port] ||= machine.config.rdp.port
 

From 8990e18e6df7324298905fc652b229a2efc42a36 Mon Sep 17 00:00:00 2001
From: Fabian Ruff <fabian@progra.de>
Date: Mon, 27 Oct 2014 18:23:00 +0100
Subject: [PATCH 005/165] fix copy and paste bug

---
 plugins/commands/rdp/command.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/commands/rdp/command.rb b/plugins/commands/rdp/command.rb
index ba6d4d453..e41c177fc 100644
--- a/plugins/commands/rdp/command.rb
+++ b/plugins/commands/rdp/command.rb
@@ -71,11 +71,11 @@ module VagrantPlugins
         end
         
         if !rdp_info[:password]
-          username = ssh_info[:password]
+          password = ssh_info[:password]
           if machine.config.vm.communicator == :winrm
-            username = machine.config.winrm.password
+            password = machine.config.winrm.password
           end
-          rdp_info[:password] = username
+          rdp_info[:password] = password
         end
         
         rdp_info[:host] ||= ssh_info[:host]

From 9ab8d05cc7b2590ce0ea88cb63fa5da45ec2cb9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?W=C5=82odzimierz=20Gajda?= <gajdaw@gajdaw.pl>
Date: Fri, 14 Nov 2014 07:46:20 +0100
Subject: [PATCH 006/165] doc destroy - notice about space occupied by the box

---
 website/docs/source/v2/cli/destroy.html.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/website/docs/source/v2/cli/destroy.html.md b/website/docs/source/v2/cli/destroy.html.md
index 8b16e7973..9ed12ea11 100644
--- a/website/docs/source/v2/cli/destroy.html.md
+++ b/website/docs/source/v2/cli/destroy.html.md
@@ -18,3 +18,15 @@ confirmation can be skipped by passing in the `-f` or `--force` flag.
 ## Options
 
 * `-f` or `--force` - Don't ask for confirmation before destroying.
+
+<div class="alert alert-info">
+    <p>
+        The <code>vagrant destroy</code> command does not remove a box
+        that may have been installed on your computer during <code>vagrant up</code>.
+        Thus, even if you run <code>vagrant destroy</code>, the box installed in the system
+        will still be present on the hard drive. To return your computer to the
+        state as it was before <code>vagrant up</code> command, you need to use
+        <code>vagrant box remove</code>. For more information, read about the
+        [vagrant box remove](/v2/cli/box.html) command.
+    </p>
+</div>

From 5de3f30bb0d3481dea8bc941ab8e36494ddc4d39 Mon Sep 17 00:00:00 2001
From: Chad Maloney <cmaloney@ghx.com>
Date: Tue, 25 Nov 2014 12:38:41 -0600
Subject: [PATCH 007/165] GH-4201: Added rsync__showoutput to display rsync
 output to console

---
 CHANGELOG.md                                        |  2 ++
 plugins/synced_folders/rsync/helper.rb              | 12 +++++++++++-
 templates/locales/en.yml                            |  1 +
 website/docs/source/v2/synced-folders/rsync.html.md |  4 ++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53565b085..72a0903d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,8 @@ IMPROVEMENTS:
   - synced\_folders/nfs: Won't use `sudo` to write to /etc/exports if there
       are write privileges. [GH-2643]
   - synced\_folders/smb: Credentials from one SMB will be copied to the rest. [GH-4675]
+  - synced\_filders/rsync: Added rsync__showoutput option to echo rsync output
+      to console [GH-4201]
 
 BUG FIXES:
 
diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index bc7f6d116..21d0890ad 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -121,13 +121,23 @@ module VagrantPlugins
           machine.ui.info(I18n.t(
             "vagrant.rsync_folder_excludes", excludes: excludes.inspect))
         end
+        if opts.include?(:showoutput)
+          machine.ui.info(I18n.t("vagrant.rsync_showingoutput"));
+        end
 
         # If we have tasks to do before rsyncing, do those.
         if machine.guest.capability?(:rsync_pre)
           machine.guest.capability(:rsync_pre, opts)
         end
 
-        r = Vagrant::Util::Subprocess.execute(*(command + [command_opts]))
+        if opts.include?(:showoutput)
+	  command_opts[:notify] = [ :stdout, :stderr ];
+          r = Vagrant::Util::Subprocess.execute(
+            *(command + [command_opts])) { |io_name,data| machine.ui.info("rsync[#{io_name}] -> #{data}") }
+        else
+          r = Vagrant::Util::Subprocess.execute(*(command + [command_opts]))
+        end
+
         if r.exit_code != 0
           raise Vagrant::Errors::RSyncError,
             command: command.join(" "),
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 81365587d..908e3bfea 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -212,6 +212,7 @@ en:
       The provider ('%{provider}') for the machine '%{name}' is
       using a proxy machine. RSync will sync to this proxy
       instead of directly to the environment itself.
+    rsync_showing_output: "Showing rsync output..."
     rsync_ssh_password: |-
       The machine you're rsyncing folders to is configured to use
       password-based authentication. Vagrant can't script rsync to automatically
diff --git a/website/docs/source/v2/synced-folders/rsync.html.md b/website/docs/source/v2/synced-folders/rsync.html.md
index 62e88d0dd..d92c6d46c 100644
--- a/website/docs/source/v2/synced-folders/rsync.html.md
+++ b/website/docs/source/v2/synced-folders/rsync.html.md
@@ -62,6 +62,10 @@ The rsync synced folder type accepts the following options:
   pattern. By default, the ".vagrant/" directory is excluded. We recommend
   excluding revision control directories such as ".git/" as well.
 
+* `rsync__showoutput` (boolean) - If true, then the output from the rsync
+  process will be echoed to the console. The output of rsync is subject
+  to rsync__args of course. By default, this is false.
+
 ## Example
 
 The following is an example of using RSync to sync a folder:

From cf784d5d3cdc2c1a49b15fc4dc5a0fcc76a40664 Mon Sep 17 00:00:00 2001
From: Chad Maloney <cmaloney@ghx.com>
Date: Tue, 25 Nov 2014 14:37:59 -0600
Subject: [PATCH 008/165] GH-4201: Split process output by line so prefix shows
 on each line. Also fixed localization reference.

---
 plugins/synced_folders/rsync/helper.rb | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index 21d0890ad..eb637af96 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -31,6 +31,10 @@ module VagrantPlugins
         Regexp.new(regexp)
       end
 
+      # Output rsync process stdout/stderr line by line
+      def self.outputRsyncData(io_name, data)
+      end
+
       def self.rsync_single(machine, ssh_info, opts)
         # Folder info
         guestpath = opts[:guestpath]
@@ -122,7 +126,7 @@ module VagrantPlugins
             "vagrant.rsync_folder_excludes", excludes: excludes.inspect))
         end
         if opts.include?(:showoutput)
-          machine.ui.info(I18n.t("vagrant.rsync_showingoutput"));
+          machine.ui.info(I18n.t("vagrant.rsync_showing_output"));
         end
 
         # If we have tasks to do before rsyncing, do those.
@@ -132,8 +136,9 @@ module VagrantPlugins
 
         if opts.include?(:showoutput)
 	  command_opts[:notify] = [ :stdout, :stderr ];
-          r = Vagrant::Util::Subprocess.execute(
-            *(command + [command_opts])) { |io_name,data| machine.ui.info("rsync[#{io_name}] -> #{data}") }
+          r = Vagrant::Util::Subprocess.execute(*(command + [command_opts])) { 
+            |io_name,data| data.each_line { |line| machine.ui.info("rsync[#{io_name}] -> #{line}") } 
+          }
         else
           r = Vagrant::Util::Subprocess.execute(*(command + [command_opts]))
         end

From fa99f95ea1b77259f8b3956fa4b01c88f76fdaa9 Mon Sep 17 00:00:00 2001
From: Chad Maloney <cmaloney@ghx.com>
Date: Tue, 25 Nov 2014 14:38:59 -0600
Subject: [PATCH 009/165] GH-4201: Filders isn't a real word

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72a0903d6..8880478e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,7 +40,7 @@ IMPROVEMENTS:
   - synced\_folders/nfs: Won't use `sudo` to write to /etc/exports if there
       are write privileges. [GH-2643]
   - synced\_folders/smb: Credentials from one SMB will be copied to the rest. [GH-4675]
-  - synced\_filders/rsync: Added rsync__showoutput option to echo rsync output
+  - synced\_folders/rsync: Added rsync__showoutput option to echo rsync output
       to console [GH-4201]
 
 BUG FIXES:

From 1ed31afeba7b919b0ab54a02f0858c45278ce35c Mon Sep 17 00:00:00 2001
From: Chad Maloney <cmaloney@ghx.com>
Date: Tue, 25 Nov 2014 14:39:56 -0600
Subject: [PATCH 010/165] GH-4201: Cleaned up some leftover junk I missed
 removing

---
 plugins/synced_folders/rsync/helper.rb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index eb637af96..a0a8598e6 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -31,10 +31,6 @@ module VagrantPlugins
         Regexp.new(regexp)
       end
 
-      # Output rsync process stdout/stderr line by line
-      def self.outputRsyncData(io_name, data)
-      end
-
       def self.rsync_single(machine, ssh_info, opts)
         # Folder info
         guestpath = opts[:guestpath]

From 9aa20d5d6b91bb1185a0177eac2700ef6eac6314 Mon Sep 17 00:00:00 2001
From: Andrew Mains <andrew.mains@upsight.com>
Date: Wed, 20 Aug 2014 12:04:32 -0700
Subject: [PATCH 011/165] Added ability to run salt orchestrations to salt
 provisioner

---
 plugins/provisioners/salt/config.rb      |  1 +
 plugins/provisioners/salt/provisioner.rb | 29 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 4d97d942c..2d325dfe0 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -15,6 +15,7 @@ module VagrantPlugins
       attr_accessor :grains_config
       attr_accessor :run_highstate
       attr_accessor :run_overstate
+      attr_accessor :orchestrations
       attr_accessor :always_install
       attr_accessor :bootstrap_script
       attr_accessor :verbose
diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 87af7cc7d..65ef63077 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -9,6 +9,7 @@ module VagrantPlugins
         run_bootstrap_script
         call_overstate
         call_highstate
+        call_orchestrate
       end
 
       # Return a list of accepted keys
@@ -336,6 +337,34 @@ module VagrantPlugins
           @machine.env.ui.info "run_highstate set to false. Not running state.highstate."
         end
       end
+
+      def call_orchestrate
+        if not @config.orchestrations
+          @machine.env.ui.info "orchestrate is nil. Not running state.orchestrate."
+          return
+        end
+
+        if not @config.install_master
+          @machine.env.ui.info "orchestrate does not make sense on a minion. Not running state.orchestrate"
+          return
+        end
+
+        log_output = lambda do |type, data|
+          if @config.verbose
+            @machine.env.ui.info(data)
+          end
+        end
+
+        @machine.env.ui.info "Running the following orchestrations: #{@config.orchestrations}"
+        @machine.env.ui.info "Running saltutil.sync_all before orchestrating"
+        @machine.communicate.sudo("salt '*' saltutil.sync_all", &log_output)
+
+        @config.orchestrations.each do |orchestration|
+          cmd = "salt-run -l info state.orchestrate #{orchestration}"
+          @machine.env.ui.info "Calling #{cmd}... (this may take a while)"
+          @machine.communicate.sudo(cmd, &log_output)
+        end
+      end
     end
   end
 end

From d2e1500c748051ecfd900f2cd3ebbcf7a4a38774 Mon Sep 17 00:00:00 2001
From: Chad Maloney <cmaloney@ghx.com>
Date: Mon, 5 Jan 2015 14:36:00 -0600
Subject: [PATCH 012/165] Review comments applied. Removed changelog. Changed
 showoutput to verbose.

---
 CHANGELOG.md                                        | 2 --
 plugins/synced_folders/rsync/helper.rb              | 4 ++--
 website/docs/source/v2/synced-folders/rsync.html.md | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8880478e9..53565b085 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,8 +40,6 @@ IMPROVEMENTS:
   - synced\_folders/nfs: Won't use `sudo` to write to /etc/exports if there
       are write privileges. [GH-2643]
   - synced\_folders/smb: Credentials from one SMB will be copied to the rest. [GH-4675]
-  - synced\_folders/rsync: Added rsync__showoutput option to echo rsync output
-      to console [GH-4201]
 
 BUG FIXES:
 
diff --git a/plugins/synced_folders/rsync/helper.rb b/plugins/synced_folders/rsync/helper.rb
index a0a8598e6..37a8a1ddd 100644
--- a/plugins/synced_folders/rsync/helper.rb
+++ b/plugins/synced_folders/rsync/helper.rb
@@ -121,7 +121,7 @@ module VagrantPlugins
           machine.ui.info(I18n.t(
             "vagrant.rsync_folder_excludes", excludes: excludes.inspect))
         end
-        if opts.include?(:showoutput)
+        if opts.include?(:verbose)
           machine.ui.info(I18n.t("vagrant.rsync_showing_output"));
         end
 
@@ -130,7 +130,7 @@ module VagrantPlugins
           machine.guest.capability(:rsync_pre, opts)
         end
 
-        if opts.include?(:showoutput)
+        if opts.include?(:verbose)
 	  command_opts[:notify] = [ :stdout, :stderr ];
           r = Vagrant::Util::Subprocess.execute(*(command + [command_opts])) { 
             |io_name,data| data.each_line { |line| machine.ui.info("rsync[#{io_name}] -> #{line}") } 
diff --git a/website/docs/source/v2/synced-folders/rsync.html.md b/website/docs/source/v2/synced-folders/rsync.html.md
index d92c6d46c..3e97be86d 100644
--- a/website/docs/source/v2/synced-folders/rsync.html.md
+++ b/website/docs/source/v2/synced-folders/rsync.html.md
@@ -62,7 +62,7 @@ The rsync synced folder type accepts the following options:
   pattern. By default, the ".vagrant/" directory is excluded. We recommend
   excluding revision control directories such as ".git/" as well.
 
-* `rsync__showoutput` (boolean) - If true, then the output from the rsync
+* `rsync__verbose` (boolean) - If true, then the output from the rsync
   process will be echoed to the console. The output of rsync is subject
   to rsync__args of course. By default, this is false.
 

From 0b6e65380a9894cf71ac8193a3f05fe18e36800a Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Sat, 17 Jan 2015 01:06:56 -0800
Subject: [PATCH 013/165] select a switch ased on a network_name

---
 plugins/providers/hyperv/action/import.rb | 46 +++++++++++++++--------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/plugins/providers/hyperv/action/import.rb b/plugins/providers/hyperv/action/import.rb
index 468a55c57..acd7e2124 100644
--- a/plugins/providers/hyperv/action/import.rb
+++ b/plugins/providers/hyperv/action/import.rb
@@ -55,23 +55,39 @@ module VagrantPlugins
           switches = env[:machine].provider.driver.execute("get_switches.ps1", {})
           raise Errors::NoSwitches if switches.empty?
 
-          switch = switches[0]["Name"]
-          if switches.length > 1
-            env[:ui].detail(I18n.t("vagrant_hyperv.choose_switch") + "\n ")
-            switches.each_index do |i|
-              switch = switches[i]
-              env[:ui].detail("#{i+1}) #{switch["Name"]}")
-            end
-            env[:ui].detail(" ")
+          switch = nil
+          env[:machine].config.vm.networks.each do |type, opts|
+            next if type != :public_network && type != :private_network
 
-            switch = nil
-            while !switch
-              switch = env[:ui].ask("What switch would you like to use? ")
-              next if !switch
-              switch = switch.to_i - 1
-              switch = nil if switch < 0 || switch >= switches.length
+            switchToFind = opts[:network_name]
+
+            if switchToFind
+              puts "Looking for switch with name: #{switchToFind}"
+              switch = switches.find { |s| s["Name"].downcase == switchToFind.downcase }["Name"]
+              puts "Found switch: #{switch}"
+            end
+          end
+
+          if switch.nil?
+            if switches.length > 1
+              env[:ui].detail(I18n.t("vagrant_hyperv.choose_switch") + "\n ")
+              switches.each_index do |i|
+                switch = switches[i]
+                env[:ui].detail("#{i+1}) #{switch["Name"]}")
+              end
+              env[:ui].detail(" ")
+
+              switch = nil
+              while !switch
+                switch = env[:ui].ask("What switch would you like to use? ")
+                next if !switch
+                switch = switch.to_i - 1
+                switch = nil if switch < 0 || switch >= switches.length
+              end
+              switch = switches[switch]["Name"]
+            else
+              switch = switches[0]["Name"]
             end
-            switch = switches[switch]["Name"]
           end
 
           env[:ui].detail("Cloning virtual hard drive...")

From 87195f8336d839ff3867cf1c092d85a1261f8290 Mon Sep 17 00:00:00 2001
From: Matt Wrock <matt@mattwrock.com>
Date: Sat, 17 Jan 2015 11:39:32 -0800
Subject: [PATCH 014/165] use :bridge instead of network_name to align with
 site docs

---
 plugins/providers/hyperv/action/import.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/hyperv/action/import.rb b/plugins/providers/hyperv/action/import.rb
index acd7e2124..0b617ad54 100644
--- a/plugins/providers/hyperv/action/import.rb
+++ b/plugins/providers/hyperv/action/import.rb
@@ -59,7 +59,7 @@ module VagrantPlugins
           env[:machine].config.vm.networks.each do |type, opts|
             next if type != :public_network && type != :private_network
 
-            switchToFind = opts[:network_name]
+            switchToFind = opts[:bridge]
 
             if switchToFind
               puts "Looking for switch with name: #{switchToFind}"

From 90719dc82f234655de86533d39c436219d97f9b9 Mon Sep 17 00:00:00 2001
From: Frank Baalbergen <frank.baalbergen@mendix.com>
Date: Wed, 11 Feb 2015 15:35:05 +0100
Subject: [PATCH 015/165] vagrant duplicates >= eth2 when defining two
 config.vm.network :private_network

When a vagrant box has two private network ips /etc/network/interfaces
will duplicate eth2 and bigger. sed matches greedy, so the first
 #VAGRANT-END matches. This will result in:

/etc/network/interfaces:29: interface eth2 declared allow-auto twice
/sbin/ifup: couldn't read interfaces file "/etc/network/interfaces"
---
 plugins/guests/debian/cap/configure_networks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/debian/cap/configure_networks.rb b/plugins/guests/debian/cap/configure_networks.rb
index 3cb896b15..cf416ec09 100644
--- a/plugins/guests/debian/cap/configure_networks.rb
+++ b/plugins/guests/debian/cap/configure_networks.rb
@@ -14,7 +14,7 @@ module VagrantPlugins
             # First, remove any previous network modifications
             # from the interface file.
             comm.sudo("sed -e '/^#VAGRANT-BEGIN/,$ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces.pre")
-            comm.sudo("sed -ne '/^#VAGRANT-END/,$ p' /etc/network/interfaces | tail -n +2 > /tmp/vagrant-network-interfaces.post")
+            comm.sudo("sed -ne '/^#VAGRANT-END/,$ p' /etc/network/interfaces | tac | sed -e '/^#VAGRANT-END/,$ d' | tac > /tmp/vagrant-network-interfaces.post")
 
             # Accumulate the configurations to add to the interfaces file as
             # well as what interfaces we're actually configuring since we use that

From 6c2cc31926f8521e08387af8b0ad521650dd6b9b Mon Sep 17 00:00:00 2001
From: Tim Rensen <t.rensen@student.tudelft.nl>
Date: Wed, 25 Feb 2015 20:37:54 +0100
Subject: [PATCH 016/165] Fixed inaccurate downloading status message

Importing a base box from the local file system currently outputs 'Downloading: file://...' which is more accurate now by presenting it as: 'Unpacking necessary files from: file://...'.
Fixes #5386.
---
 lib/vagrant/action/builtin/box_add.rb | 9 ++++++++-
 templates/locales/en.yml              | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index deed8b9ef..fdfb4edc4 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -420,8 +420,15 @@ module Vagrant
             show_url = opts[:show_url]
             show_url ||= url
 
+            textLoading = "vagrant.box_downloading"
+
+            # Adjust status message when 'downloading' a local box.
+            if(show_url.start_with?('file://'))
+              textLoading = "vagrant.box_unpacking"
+            end
+
             env[:ui].detail(I18n.t(
-              "vagrant.box_downloading",
+              textLoading,
               url: show_url))
             if File.file?(d.destination)
               env[:ui].info(I18n.t("vagrant.actions.box.download.resuming"))
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 155cd77dc..fa75c2a01 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -24,6 +24,8 @@ en:
       Downloading: %{url}
     box_download_error: |-
       Error downloading: %{message}
+    box_unpacking: |-
+      Unpacking necessary files from: %{url}
     box_expanding_url: |-
       URL: %{url}
     box_loading_metadata: |-

From 51842623db19fc7bbbe8edce21dd21b3493f3874 Mon Sep 17 00:00:00 2001
From: edward010 <edward_da_indo@hotmail.com>
Date: Thu, 26 Feb 2015 18:31:01 +0100
Subject: [PATCH 017/165] Improved the package error message

The package error message will now show the actual package name if the
package already existed.
---
 lib/vagrant/action/general/package.rb | 5 +++--
 templates/locales/en.yml              | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/action/general/package.rb b/lib/vagrant/action/general/package.rb
index 99c0002ec..58991222c 100644
--- a/lib/vagrant/action/general/package.rb
+++ b/lib/vagrant/action/general/package.rb
@@ -29,9 +29,10 @@ module Vagrant
 
         def call(env)
           @env = env
-
+          file_name = File.basename(@env["package.output"].to_s)
+          
           raise Errors::PackageOutputDirectory if File.directory?(tar_path)
-          raise Errors::PackageOutputExists if File.exist?(tar_path)
+          raise Errors::PackageOutputExists, file_name:file_name if File.exist?(tar_path)
           raise Errors::PackageRequiresDirectory if !env["package.directory"] ||
             !File.directory?(env["package.directory"])
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 155cd77dc..4ce7b28ec 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1749,7 +1749,7 @@ en:
           packaging: "Packaging additional file: %{file}"
           compressing: "Compressing package to: %{tar_path}"
           output_exists: |-
-            The specified file to save the package as already exists. Please
+            The specified file '%{file_name}' to save the package as already exists. Please
             remove this file or specify a different file name for outputting.
           output_is_directory: |-
             The specified output is a directory. Please specify a path including

From 3b8bc2a433c14a1c8ce159f034a457180683b788 Mon Sep 17 00:00:00 2001
From: Dan Duvall <dduvall@wikimedia.org>
Date: Wed, 4 Mar 2015 11:09:34 -0800
Subject: [PATCH 018/165] core: allow IO redirection of UI for testing

Use of $stdin, $stdout, and $stderr globals makes testing difficult. By
exposing the IO objects as writable attributes, input/output can be more
easily simulated using StringIO or doubles.
---
 lib/vagrant/ui.rb            | 23 ++++++++++++++++++-----
 test/unit/vagrant/ui_test.rb | 22 ++++++++++++++++++----
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index a84448a1c..d26633f2f 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -21,9 +21,22 @@ module Vagrant
       # specific. See the implementation for more docs.
       attr_accessor :opts
 
+      # @return [IO] UI input. Defaults to `$stdin`.
+      attr_accessor :stdin
+
+      # @return [IO] UI output. Defaults to `$stdout`.
+      attr_accessor :stdout
+
+      # @return [IO] UI error output. Defaults to `$stderr`.
+      attr_accessor :stderr
+
       def initialize
         @logger   = Log4r::Logger.new("vagrant::ui::interface")
         @opts     = {}
+
+        @stdin  = $stdin
+        @stdout = $stdout
+        @stderr = $stderr
       end
 
       def initialize_copy(original)
@@ -132,7 +145,7 @@ module Vagrant
         super(message)
 
         # We can't ask questions when the output isn't a TTY.
-        raise Errors::UIExpectsTTY if !$stdin.tty? && !Vagrant::Util::Platform.cygwin?
+        raise Errors::UIExpectsTTY if !@stdin.tty? && !Vagrant::Util::Platform.cygwin?
 
         # Setup the options so that the new line is suppressed
         opts ||= {}
@@ -144,11 +157,11 @@ module Vagrant
         say(:info, message, opts)
 
         input = nil
-        if opts[:echo]
-          input = $stdin.gets
+        if opts[:echo] || !@stdin.respond_to?(:noecho)
+          input = @stdin.gets
         else
           begin
-            input = $stdin.noecho(&:gets)
+            input = @stdin.noecho(&:gets)
 
             # Output a newline because without echo, the newline isn't
             # echoed either.
@@ -206,7 +219,7 @@ module Vagrant
 
         # Determine the proper IO channel to send this message
         # to based on the type of the message
-        channel = type == :error || opts[:channel] == :error ? $stderr : $stdout
+        channel = type == :error || opts[:channel] == :error ? @stderr : @stdout
 
         # Output! We wrap this in a lock so that it safely outputs only
         # one line at a time. We wrap this in a thread because as of Ruby 2.0
diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb
index 537161a56..b4a7d7d89 100644
--- a/test/unit/vagrant/ui_test.rb
+++ b/test/unit/vagrant/ui_test.rb
@@ -40,23 +40,37 @@ describe Vagrant::UI::Basic do
       subject.output("foo", new_line: false)
     end
 
-    it "outputs to stdout" do
+    it "outputs to the assigned stdout" do
+      stdout = StringIO.new
+      subject.stdout = stdout
+
       expect(subject).to receive(:safe_puts).with { |message, **opts|
-        expect(opts[:io]).to be($stdout)
+        expect(opts[:io]).to be(stdout)
         true
       }
 
       subject.output("foo")
     end
 
-    it "outputs to stderr for errors" do
+    it "outputs to stdout by default" do
+      expect(subject.stdout).to be($stdout)
+    end
+
+    it "outputs to the assigned stderr for errors" do
+      stderr = StringIO.new
+      subject.stderr = stderr
+
       expect(subject).to receive(:safe_puts).with { |message, **opts|
-        expect(opts[:io]).to be($stderr)
+        expect(opts[:io]).to be(stderr)
         true
       }
 
       subject.error("foo")
     end
+
+    it "outputs to stderr for errors by default" do
+      expect(subject.stderr).to be($stderr)
+    end
   end
 
   context "#detail" do

From 2f4a0af5d13e24e2a019130dd6a84ecb10f36b21 Mon Sep 17 00:00:00 2001
From: Jamezz <di.jamezz@gmail.com>
Date: Wed, 4 Mar 2015 18:08:07 -0800
Subject: [PATCH 019/165] Fix issue #4152: Salt minion bootstrapping

Copy the config after we know the installer exits. Also rev the
installed version to 2014.7.1 (latest stable as of 3/4/2015)
---
 plugins/provisioners/salt/bootstrap-salt.ps1 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1
index c8d7e7ab2..1b6d1f6ab 100644
--- a/plugins/provisioners/salt/bootstrap-salt.ps1
+++ b/plugins/provisioners/salt/bootstrap-salt.ps1
@@ -1,5 +1,5 @@
 # Salt version to install
-$version = '2014.1.10'
+$version = '2014.7.1'
 
 # Create C:\tmp\ - if Vagrant doesn't upload keys and/or config it might not exist
 New-Item C:\tmp\ -ItemType directory | out-null
@@ -13,11 +13,6 @@ if (Test-Path C:\tmp\minion.pem) {
   cp C:\tmp\minion.pub C:\salt\conf\pki\minion\
 }
 
-# Check if minion config has been uploaded
-if (Test-Path C:\tmp\minion) {
-  cp C:\tmp\minion C:\salt\conf\
-}
-
 # Detect architecture
 if ([IntPtr]::Size -eq 4) {
   $arch = "win32"
@@ -34,7 +29,13 @@ $webclient.DownloadFile($url, $file)
 
 # Install minion silently
 Write-Host "Installing Salt minion..."
-C:\tmp\salt.exe /S
+#Wait for process to exit before continuing...
+C:\tmp\salt.exe /S | Out-Null
+
+# Check if minion config has been uploaded
+if (Test-Path C:\tmp\minion) {
+  cp C:\tmp\minion C:\salt\conf\
+}
 
 # Wait for salt-minion service to be registered before trying to start it
 $service = Get-Service salt-minion -ErrorAction SilentlyContinue

From 71c40bdf6a03a2fb1d25ca39952d9f3b05cac213 Mon Sep 17 00:00:00 2001
From: Jamezz <di.jamezz@gmail.com>
Date: Fri, 6 Mar 2015 13:14:11 -0800
Subject: [PATCH 020/165] File architecture string  should be x86

As of 2014.7.0, Salt has changed their file naming for 32-bit from win32
to x86.
---
 plugins/provisioners/salt/bootstrap-salt.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1
index 1b6d1f6ab..75dcc9462 100644
--- a/plugins/provisioners/salt/bootstrap-salt.ps1
+++ b/plugins/provisioners/salt/bootstrap-salt.ps1
@@ -15,7 +15,7 @@ if (Test-Path C:\tmp\minion.pem) {
 
 # Detect architecture
 if ([IntPtr]::Size -eq 4) {
-  $arch = "win32"
+  $arch = "x86"
 } else {
   $arch = "AMD64"
 }

From 291db96510af6687569536e25150fb087737f89a Mon Sep 17 00:00:00 2001
From: Paul Hinze <paul@hashicorp.com>
Date: Thu, 12 Mar 2015 15:25:40 -0500
Subject: [PATCH 021/165] communicators/winrm: don't stop task on idle end

StopOnIdleEnd was set in the task definition for elevated/privileged
windows guest scripts. This setting:

> specifies that the task stops when the idle condition ceases to be true [1]

The "idle condition" is something that Windows periodically checks for,
and it's defined by a bunch of criteria like user presence/absence, CPU
/ IO idle time, etc. [2]

Telling our provisioner to stop the task if the "idle condition" ceases
to be true is a recipe for some sporadically stopped tasks, which seems
like precisely the behavior being reported in #5362.

I'm pretty sure this fixes #5362

[1] https://msdn.microsoft.com/en-us/library/cc248332.aspx
[2] https://msdn.microsoft.com/en-us/library/windows/desktop/aa383561%28v=vs.85%29.aspx
---
 plugins/communicators/winrm/scripts/elevated_shell.ps1.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
index 454e5e874..923f034bb 100644
--- a/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
+++ b/plugins/communicators/winrm/scripts/elevated_shell.ps1.erb
@@ -27,7 +27,7 @@ $task_xml = @'
     <StartWhenAvailable>false</StartWhenAvailable>
     <RunOnlyIfNetworkAvailable>false</RunOnlyIfNetworkAvailable>
     <IdleSettings>
-      <StopOnIdleEnd>true</StopOnIdleEnd>
+      <StopOnIdleEnd>false</StopOnIdleEnd>
       <RestartOnIdle>false</RestartOnIdle>
     </IdleSettings>
     <AllowStartOnDemand>true</AllowStartOnDemand>

From 992c148169ec1881868933aa8448e1198dcfeabf Mon Sep 17 00:00:00 2001
From: Ben Jansen <bjansen@tripwire.com>
Date: Fri, 13 Mar 2015 11:42:55 -0700
Subject: [PATCH 022/165] Ignore Windows NICs with nil :net_connection_id

When upping a Win XP box, vagrant found a lot of "virtual" network
connections that did not have DHCP enabled, and tried to configure them
for DHCP. This did not work because their :net_connection_id is nil.
Ignoring these network connections enabled the XP box to be upped.
---
 plugins/guests/windows/cap/configure_networks.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/guests/windows/cap/configure_networks.rb b/plugins/guests/windows/cap/configure_networks.rb
index 8130cef77..8e766a319 100644
--- a/plugins/guests/windows/cap/configure_networks.rb
+++ b/plugins/guests/windows/cap/configure_networks.rb
@@ -64,7 +64,9 @@ module VagrantPlugins
           guest_network.network_adapters.each do |nic|
             @@logger.debug("nic: #{nic.inspect}")
             naked_mac = nic[:mac_address].gsub(':','')
-            if driver_mac_address[naked_mac]
+            # If the :net_connection_id entry is nil then it is probably a virtual connection
+            # and should be ignored.
+            if driver_mac_address[naked_mac] && !nic[:net_connection_id].nil?
               vm_interface_map[driver_mac_address[naked_mac]] = {
                 net_connection_id: nic[:net_connection_id],
                 mac_address: naked_mac,

From 21538fd64f201437e9883b234f43655bf01bb383 Mon Sep 17 00:00:00 2001
From: follower <github@rancidbacon.com>
Date: Mon, 16 Mar 2015 03:17:56 +1300
Subject: [PATCH 023/165] Fix known/kownn typo

---
 website/docs/source/v2/provisioning/ansible.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/ansible.html.md b/website/docs/source/v2/provisioning/ansible.html.md
index 10fd1fc6d..21d469a97 100644
--- a/website/docs/source/v2/provisioning/ansible.html.md
+++ b/website/docs/source/v2/provisioning/ansible.html.md
@@ -218,7 +218,7 @@ by the sudo command.
 * `ansible.start_at_task` can be set to a string corresponding to the task name where the playbook provision will start.
 * `ansible.raw_arguments` can be set to an array of strings corresponding to a list of `ansible-playbook` arguments (e.g. `['--check', '-M /my/modules']`). It is an *unsafe wildcard* that can be used to apply Ansible options that are not (yet) supported by this Vagrant provisioner. As of Vagrant 1.7, `raw_arguments` has the highest priority and its values can potentially override or break other Vagrant settings.
 * `ansible.raw_ssh_args` can be set to an array of strings corresponding to a list of OpenSSH client parameters (e.g. `['-o ControlMaster=no']`). It is an *unsafe wildcard* that can be used to pass additional SSH settings to Ansible via `ANSIBLE_SSH_ARGS` environment variable.
-* `ansible.host_key_checking` can be set to `true` which will enable host key checking. As of Vagrant 1.5, the default value is `false` and as of Vagrant 1.7 the user kownn host file (e.g. `~/.ssh/known_hosts`) is no longer read nor modified. In other words: by default, the Ansible provisioner behaves the same as Vagrant native commands (e.g `vagrant ssh`).
+* `ansible.host_key_checking` can be set to `true` which will enable host key checking. As of Vagrant 1.5, the default value is `false` and as of Vagrant 1.7 the user known host file (e.g. `~/.ssh/known_hosts`) is no longer read nor modified. In other words: by default, the Ansible provisioner behaves the same as Vagrant native commands (e.g `vagrant ssh`).
 
 ## Tips and Tricks
 

From 7d17574a76e97ec5548dce44a4d13e43886eaa6d Mon Sep 17 00:00:00 2001
From: Jean-Francois Bibeau <jean-francois.bibeau@alcatel-lucent.com>
Date: Wed, 18 Mar 2015 15:29:43 -0400
Subject: [PATCH 024/165] changing windows/virtualbox shared path names to UNC
 format to allow > 256 characters

---
 plugins/providers/virtualbox/driver/version_4_3.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb
index 2d257a8c1..81f2252b6 100644
--- a/plugins/providers/virtualbox/driver/version_4_3.rb
+++ b/plugins/providers/virtualbox/driver/version_4_3.rb
@@ -499,7 +499,7 @@ module VagrantPlugins
             args = ["--name",
               folder[:name],
               "--hostpath",
-              folder[:hostpath]]
+              Vagrant::Util::Platform.windows? ? ("//?/" + File.expand_path(folder[:hostpath])).gsub("/","\\") : folder[:hostpath]]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             # Enable symlinks on the shared folder

From b43413525fea4fd38a80fc9b6f3687ed6ac759b3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 23 Mar 2015 13:11:54 +0100
Subject: [PATCH 025/165] guests/freebsd: fix call of set -i : missing
 extension

Sed on freebsd seems to be mores strict than on other
platforms about use of -i: the extension is not optional.

Signed-off-by: Michael Adam <obnox@samba.org>
---
 plugins/guests/freebsd/cap/remove_public_key.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/freebsd/cap/remove_public_key.rb b/plugins/guests/freebsd/cap/remove_public_key.rb
index 13abc864b..8d5526ca4 100644
--- a/plugins/guests/freebsd/cap/remove_public_key.rb
+++ b/plugins/guests/freebsd/cap/remove_public_key.rb
@@ -11,7 +11,7 @@ module VagrantPlugins
           machine.communicate.tap do |comm|
             if comm.test("test -f ~/.ssh/authorized_keys")
               comm.execute(
-                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+                "sed -i .bak '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
             end
           end
         end

From 0b737b86839f5c2fde5547cd464cb94095536a97 Mon Sep 17 00:00:00 2001
From: Mattias Appelgren <mattias@ppelgren.se>
Date: Wed, 25 Mar 2015 15:51:23 +0100
Subject: [PATCH 026/165] contrib/bash: Auto-complete VMs for up command

---
 contrib/bash/completion.sh | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/contrib/bash/completion.sh b/contrib/bash/completion.sh
index e21dc8dcf..2b201d1ba 100644
--- a/contrib/bash/completion.sh
+++ b/contrib/bash/completion.sh
@@ -70,8 +70,13 @@ _vagrant() {
               return 0
             ;;
             "up")
+              vagrant_state_file=$(__vagrantinvestigate) || return 1
+              if [[ -d $vagrant_state_file ]]
+              then
+                local vm_list=$(find $vagrant_state_file/machines -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+              fi
               local up_commands="--no-provision"
-              COMPREPLY=($(compgen -W "${up_commands}" -- ${cur}))
+              COMPREPLY=($(compgen -W "${up_commands} ${vm_list}" -- ${cur}))
               return 0
             ;;
             "ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config")
@@ -107,18 +112,32 @@ _vagrant() {
     if [ $COMP_CWORD == 3 ]
     then
       action="${COMP_WORDS[COMP_CWORD-2]}"
-      if [ $action == 'box' ]
-      then
-        case "$prev" in
+      case "$action" in
+        "up")
+          if [ "$prev" == "--no-provision" ]
+          then
+            if [[ -d $vagrant_state_file ]]
+            then
+              local vm_list=$(find $vagrant_state_file/machines -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
+            fi
+            COMPREPLY=($(compgen -W "${vm_list}" -- ${cur}))
+            return 0
+          fi
+          ;;
+        "box")
+          case "$prev" in
             "remove"|"repackage")
               local box_list=$(find "${VAGRANT_HOME:-${HOME}/.vagrant.d}/boxes" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
               COMPREPLY=($(compgen -W "${box_list}" -- ${cur}))
               return 0
               ;;
             *)
-            ;;
-        esac
-      fi
+              ;;
+          esac
+          ;;
+        *)
+          ;;
+      esac
     fi
 
 }

From e745436df3c64537570953d4d815eaec840da46d Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 28 Mar 2015 19:05:54 -0500
Subject: [PATCH 027/165] provisioners/ansible: disable color if Vagrant has no
 color [GH-5531]

---
 plugins/provisioners/ansible/provisioner.rb               | 3 ++-
 .../unit/plugins/provisioners/ansible/provisioner_test.rb | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb
index 9e2cb155b..6b6ea2d87 100644
--- a/plugins/provisioners/ansible/provisioner.rb
+++ b/plugins/provisioners/ansible/provisioner.rb
@@ -68,9 +68,10 @@ module VagrantPlugins
 
           # Some Ansible options must be passed as environment variables,
           # as there is no equivalent command line arguments
-          "ANSIBLE_FORCE_COLOR" => "true",
           "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}",
         }
+        env["ANSIBLE_NOCOLOR"] = "true" unless @machine.env.ui.is_a?(Vagrant::UI::Colored)
+
         # ANSIBLE_SSH_ARGS is required for Multiple SSH keys, SSH forwarding and custom SSH settings
         env["ANSIBLE_SSH_ARGS"] = ansible_ssh_args unless ansible_ssh_args.empty?
 
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 05fa8fae3..5ed6f80e5 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -110,7 +110,7 @@ VF
           expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o UserKnownHostsFile=/dev/null")
         end
         expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentitiesOnly=yes")
-        expect(cmd_opts[:env]['ANSIBLE_FORCE_COLOR']).to eql("true")
+        expect(cmd_opts[:env]['ANSIBLE_NOCOLOR']).to eql("true")
         expect(cmd_opts[:env]['ANSIBLE_HOST_KEY_CHECKING']).to eql(expected_host_key_checking.to_s)
         expect(cmd_opts[:env]['PYTHONUNBUFFERED']).to eql(1)
       }
@@ -468,7 +468,7 @@ VF
 
       it "shows the ansible-playbook command" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} playbook.yml")
         }
       end
     end
@@ -483,7 +483,7 @@ VF
 
       it "shows the ansible-playbook command" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
         }
       end
     end
@@ -541,7 +541,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/my/key1 --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/my/key1 --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' playbook.yml")
         }
       end
     end

From 1a2f403d0c73a09ecb5151b2c2b65a02f7341f58 Mon Sep 17 00:00:00 2001
From: Tim Rensen <t.rensen@student.tudelft.nl>
Date: Mon, 30 Mar 2015 12:41:19 +0200
Subject: [PATCH 028/165] Fixed VirtualBox's error message on 'private_network'

---
 templates/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 155cd77dc..f5de5b2c0 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -285,7 +285,7 @@ en:
         id_in_pre_import: |-
           The ':id' parameter is not available in "pre-import" customizations.
         intnet_on_bad_type: |-
-          VirtualBox internal networks can only be enabled on "private_networks"
+          VirtualBox internal networks can only be enabled on "private_network"
         invalid_event: |-
           %{event} is not a valid event for customization. Valid events
           are: %{valid_events}

From fd557592d4f6fb96055837b6ce6fb132f8a84d91 Mon Sep 17 00:00:00 2001
From: ssugar <scottsugar@outlook.com>
Date: Mon, 30 Mar 2015 20:00:16 +0700
Subject: [PATCH 029/165] only set EFI secure boot for gen 2 machines in hyperv
 provider

---
 plugins/providers/hyperv/scripts/import_vm.ps1 | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/providers/hyperv/scripts/import_vm.ps1 b/plugins/providers/hyperv/scripts/import_vm.ps1
index 791daecd7..3e8664eb2 100644
--- a/plugins/providers/hyperv/scripts/import_vm.ps1
+++ b/plugins/providers/hyperv/scripts/import_vm.ps1
@@ -136,11 +136,14 @@ $vm | Set-VM @more_vm_params -Passthru
 # Add drives to the virtual machine
 $controllers = Select-Xml -xml $vmconfig -xpath "//*[starts-with(name(.),'controller')]"
 
-# Set EFI secure boot 
-if ($secure_boot_enabled -eq "True") {
-    Set-VMFirmware -VM $vm -EnableSecureBoot On
-}  else {
-    Set-VMFirmware -VM $vm -EnableSecureBoot Off
+# Only set EFI secure boot for Gen 2 machines, not gen 1
+if ($generation -ne 1) {
+	# Set EFI secure boot 
+	if ($secure_boot_enabled -eq "True") {
+		Set-VMFirmware -VM $vm -EnableSecureBoot On
+	}  else {
+		Set-VMFirmware -VM $vm -EnableSecureBoot Off
+	}
 }
 
 # A regular expression pattern to pull the number from controllers

From 91752bcd1a512cb30fda78a685f82c6e2be89754 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 30 Mar 2015 10:18:38 -0400
Subject: [PATCH 030/165] Update CHANGELOG

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd657fa48..979ad1cf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ BUG FIXES:
       space on some systems. [GH-5302]
   - providers/hyperv: allow users to configure memory, cpu count, and vmname [GH-5183]
   - providers/hyperv: import respects secure boot. [GH-5209]
+  - providers/hyperv: only set EFI secure boot for gen 2 machines [GH-5538]
   - providers/virtualbox: read netmask from dhcpservers [GH-5233]
   - providers/virtualbox: Fix exception when VirtualBox version is empty. [GH-5308]
   - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
@@ -39,7 +40,8 @@ BUG FIXES:
   - provisioners/chef-zero: support more chef-zero/local mode attributes [GH-5339]
   - provisioners/docker: use docker.com instead of docker.io [GH-5216]
   - pushes/atlas: send additional box metadata [GH-5283]
-  - synced\_folders/rsync: Add `IdentitiesOnly=yes` to the rsync command. [GH-5175]
+  - synced\_folders/rsync: add `IdentitiesOnly=yes` to the rsync command. [GH-5175]
+  - virtualbox/config: fix misleading error message for private_network [GH-5536, GH-5418]
 
 ## 1.7.2 (January 6, 2015)
 

From f5ee8b8b7d25883e2715de630e03dcb550da3958 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 30 Mar 2015 10:19:02 -0400
Subject: [PATCH 031/165] Ignore vendor/

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 801132d2d..b1274f4d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ pkg/*
 tags
 /Gemfile.lock
 test/tmp/
+vendor/
 
 # Documentation
 _site/*

From 9e23d16d9c07d5544280d58e218c6d99ce7c1366 Mon Sep 17 00:00:00 2001
From: Volodymyr Babchynskyy <vvchik@gmail.com>
Date: Mon, 30 Mar 2015 08:37:29 -0600
Subject: [PATCH 032/165] merged vlan_id changes for hyperv by tomassrnka

---
 plugins/providers/hyperv/action.rb            |  2 ++
 .../providers/hyperv/action/net_set_vlan.rb   | 19 +++++++++++++++++++
 plugins/providers/hyperv/config.rb            |  7 +++++++
 plugins/providers/hyperv/driver.rb            |  4 ++++
 .../hyperv/scripts/set_network_vlan.ps1       | 18 ++++++++++++++++++
 .../plugins/providers/hyperv/config_test.rb   | 12 ++++++++++++
 6 files changed, 62 insertions(+)
 create mode 100644 plugins/providers/hyperv/action/net_set_vlan.rb
 create mode 100644 plugins/providers/hyperv/scripts/set_network_vlan.ps1

diff --git a/plugins/providers/hyperv/action.rb b/plugins/providers/hyperv/action.rb
index 49e2be33f..64fbec180 100644
--- a/plugins/providers/hyperv/action.rb
+++ b/plugins/providers/hyperv/action.rb
@@ -116,6 +116,7 @@ module VagrantPlugins
               end
 
               b2.use Provision
+              b2.use NetSetVLan
               b2.use StartInstance
               b2.use WaitForIPAddress
               b2.use WaitForCommunicator, [:running]
@@ -216,6 +217,7 @@ module VagrantPlugins
       autoload :StopInstance, action_root.join('stop_instance')
       autoload :SuspendVM, action_root.join("suspend_vm")
       autoload :WaitForIPAddress, action_root.join("wait_for_ip_address")
+      autoload :NetSetVLan, action_root.join("net_set_vlan")
       autoload :MessageWillNotDestroy, action_root.join("message_will_not_destroy")
     end
   end
diff --git a/plugins/providers/hyperv/action/net_set_vlan.rb b/plugins/providers/hyperv/action/net_set_vlan.rb
new file mode 100644
index 000000000..9ce26d324
--- /dev/null
+++ b/plugins/providers/hyperv/action/net_set_vlan.rb
@@ -0,0 +1,19 @@
+module VagrantPlugins
+  module HyperV
+    module Action
+      class NetSetVLan
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          vlan_id = env[:machine].provider_config.vlan_id
+
+          env[:ui].info("[Settings] [Network Adapter] Setting Vlan ID to: #{vlan_id}")
+          env[:machine].provider.driver.net_set_vlan(vlan_id)
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/providers/hyperv/config.rb b/plugins/providers/hyperv/config.rb
index 89b51c0a6..55c1be673 100644
--- a/plugins/providers/hyperv/config.rb
+++ b/plugins/providers/hyperv/config.rb
@@ -13,12 +13,18 @@ module VagrantPlugins
       attr_accessor :cpus
       attr_accessor :vmname
 
+      # The default VLAN ID for network interface for the virtual machine.
+      #
+      # @return [Integer]
+      attr_accessor :vlan_id
+
       def initialize
         @ip_address_timeout = UNSET_VALUE
         @memory = UNSET_VALUE
         @maxmemory = UNSET_VALUE
         @cpus = UNSET_VALUE
         @vmname = UNSET_VALUE
+        @vlan_id  = UNSET_VALUE
       end
 
       def finalize!
@@ -29,6 +35,7 @@ module VagrantPlugins
         @maxmemory = nil if @maxmemory == UNSET_VALUE
         @cpus = nil if @cpus == UNSET_VALUE 
         @vmname = nil if @vmname == UNSET_VALUE
+        @vlan_id = 0 if @vlan_id == UNSET_VALUE
       end
 
       def validate(machine)
diff --git a/plugins/providers/hyperv/driver.rb b/plugins/providers/hyperv/driver.rb
index 9f11881e6..db99d5dfe 100644
--- a/plugins/providers/hyperv/driver.rb
+++ b/plugins/providers/hyperv/driver.rb
@@ -77,6 +77,10 @@ module VagrantPlugins
          execute('import_vm.ps1', options)
        end
 
+       def net_set_vlan(vlan_id)
+          execute("set_network_vlan.ps1", { VmId: vm_id, VlanId: vlan_id })
+       end
+
       protected
 
       def execute_powershell(path, options, &block)
diff --git a/plugins/providers/hyperv/scripts/set_network_vlan.ps1 b/plugins/providers/hyperv/scripts/set_network_vlan.ps1
new file mode 100644
index 000000000..a2b271b91
--- /dev/null
+++ b/plugins/providers/hyperv/scripts/set_network_vlan.ps1
@@ -0,0 +1,18 @@
+param (
+    [string]$VmId = $(throw "-VmId is required."),
+    [int]$VlanId = $(throw "-VlanId ")
+ )
+
+# Include the following modules
+$presentDir = Split-Path -parent $PSCommandPath
+$modules = @()
+$modules += $presentDir + "\utils\write_messages.ps1"
+forEach ($module in $modules) { . $module }
+
+try {
+  $vm = Get-VM -Id $VmId -ErrorAction "stop"
+  Set-VMNetworkAdapterVlan $vm -Access -Vlanid $VlanId
+}
+catch {
+  Write-Error-Message "Failed to set VM's Vlan ID $_"
+}
diff --git a/test/unit/plugins/providers/hyperv/config_test.rb b/test/unit/plugins/providers/hyperv/config_test.rb
index a3c46c619..4bdc2daa3 100644
--- a/test/unit/plugins/providers/hyperv/config_test.rb
+++ b/test/unit/plugins/providers/hyperv/config_test.rb
@@ -13,6 +13,18 @@ describe VagrantPlugins::HyperV::Config do
       subject.finalize!
       expect(subject.ip_address_timeout).to eq(120)
     end
+
+  describe "#vlan_id" do
+    it "can be set" do
+      subject.vlan_id = 100
+      subject.finalize!
+      expect(subject.vlan_id).to eq(100)
+    end
+
+    it "defaults to a number" do
+      subject.finalize!
+      expect(subject.vlan_id).to eq(0)
+    end
   end
   describe "#vmname" do
     it "can be set" do

From 9a0aab4bd783240d1938026ec4a4d4f355fe49cc Mon Sep 17 00:00:00 2001
From: Volodymyr Babchynskyy <vvchik@gmail.com>
Date: Mon, 30 Mar 2015 10:17:29 -0600
Subject: [PATCH 033/165] Improved behavior for case if vlan_id is not set

---
 .../providers/hyperv/action/net_set_vlan.rb   |  7 +++---
 plugins/providers/hyperv/config.rb            | 23 +++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/plugins/providers/hyperv/action/net_set_vlan.rb b/plugins/providers/hyperv/action/net_set_vlan.rb
index 9ce26d324..c65f5a7cb 100644
--- a/plugins/providers/hyperv/action/net_set_vlan.rb
+++ b/plugins/providers/hyperv/action/net_set_vlan.rb
@@ -8,9 +8,10 @@ module VagrantPlugins
 
         def call(env)
           vlan_id = env[:machine].provider_config.vlan_id
-
-          env[:ui].info("[Settings] [Network Adapter] Setting Vlan ID to: #{vlan_id}")
-          env[:machine].provider.driver.net_set_vlan(vlan_id)
+          if  vlan_id
+            env[:ui].info("[Settings] [Network Adapter] Setting Vlan ID to: #{vlan_id}")
+            env[:machine].provider.driver.net_set_vlan(vlan_id)
+          end  
           @app.call(env)
         end
       end
diff --git a/plugins/providers/hyperv/config.rb b/plugins/providers/hyperv/config.rb
index 55c1be673..fe247a242 100644
--- a/plugins/providers/hyperv/config.rb
+++ b/plugins/providers/hyperv/config.rb
@@ -3,20 +3,13 @@ require "vagrant"
 module VagrantPlugins
   module HyperV
     class Config < Vagrant.plugin("2", :config)
-      # The timeout to wait for an IP address when booting the machine,
-      # in seconds.
-      #
-      # @return [Integer]
-      attr_accessor :ip_address_timeout
-      attr_accessor :memory
-      attr_accessor :maxmemory
-      attr_accessor :cpus
-      attr_accessor :vmname
-
-      # The default VLAN ID for network interface for the virtual machine.
-      #
-      # @return [Integer]
-      attr_accessor :vlan_id
+      
+      attr_accessor :ip_address_timeout # Time to wait for an IP address when booting, in seconds @return [Integer]
+      attr_accessor :memory #  Memory size in mb @return [Integer]
+      attr_accessor :maxmemory # Maximal memory size in mb enables dynamical memory allocation @return [Integer]
+      attr_accessor :cpus # Number of cpu's @return [Integer]
+      attr_accessor :vmname # Name that will be shoen in Hyperv Manager @return [String]
+      attr_accessor :vlan_id # VLAN ID for network interface for the virtual machine. @return [Integer]
 
       def initialize
         @ip_address_timeout = UNSET_VALUE
@@ -35,7 +28,7 @@ module VagrantPlugins
         @maxmemory = nil if @maxmemory == UNSET_VALUE
         @cpus = nil if @cpus == UNSET_VALUE 
         @vmname = nil if @vmname == UNSET_VALUE
-        @vlan_id = 0 if @vlan_id == UNSET_VALUE
+        @vlan_id = nil if @vlan_id == UNSET_VALUE
       end
 
       def validate(machine)

From b752805d537133c1614ecff91696b409d75a7a12 Mon Sep 17 00:00:00 2001
From: Volodymyr Babchynskyy <vvchik@gmail.com>
Date: Mon, 30 Mar 2015 10:29:06 -0600
Subject: [PATCH 034/165] Vlan_id configuration option description added to
 documentation

---
 website/docs/source/v2/hyperv/configuration.html.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/docs/source/v2/hyperv/configuration.html.md b/website/docs/source/v2/hyperv/configuration.html.md
index 18ed9e89c..b9f255181 100644
--- a/website/docs/source/v2/hyperv/configuration.html.md
+++ b/website/docs/source/v2/hyperv/configuration.html.md
@@ -17,6 +17,8 @@ you may set. A complete reference is shown below:
   * `maxmemory` (integer) - Number of MegaBytes maximal allowed to allocate for VM
   	This parameter is switch on Dynamic Allocation of memory.
   	Defaults is taken from box image XML.
+  * `vlan_id` (integer) - Number of Vlan ID for your guest network interface
+    Defaults is not defined, vlan configuration will be untouched if not set.
   * `ip_address_timeout` (integer) - The time in seconds to wait for the
     virtual machine to report an IP address. This defaults to 120 seconds.
     This may have to be increased if your VM takes longer to boot.

From 7628ca71e7a6cf449e3c7ea258ed366bfffc94e6 Mon Sep 17 00:00:00 2001
From: Volodymyr Babchynskyy <vvchik@gmail.com>
Date: Mon, 30 Mar 2015 10:57:11 -0600
Subject: [PATCH 035/165] Removed default dependences to number

---
 test/unit/plugins/providers/hyperv/config_test.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/unit/plugins/providers/hyperv/config_test.rb b/test/unit/plugins/providers/hyperv/config_test.rb
index 4bdc2daa3..564473873 100644
--- a/test/unit/plugins/providers/hyperv/config_test.rb
+++ b/test/unit/plugins/providers/hyperv/config_test.rb
@@ -20,11 +20,6 @@ describe VagrantPlugins::HyperV::Config do
       subject.finalize!
       expect(subject.vlan_id).to eq(100)
     end
-
-    it "defaults to a number" do
-      subject.finalize!
-      expect(subject.vlan_id).to eq(0)
-    end
   end
   describe "#vmname" do
     it "can be set" do

From 8e6db0015f5a42ca9e3795e6cf72fde480acfa4c Mon Sep 17 00:00:00 2001
From: Volodymyr Babchynskyy <vvchik@gmail.com>
Date: Mon, 30 Mar 2015 11:01:38 -0600
Subject: [PATCH 036/165] Fixed typo

---
 test/unit/plugins/providers/hyperv/config_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/plugins/providers/hyperv/config_test.rb b/test/unit/plugins/providers/hyperv/config_test.rb
index 564473873..e8595aef7 100644
--- a/test/unit/plugins/providers/hyperv/config_test.rb
+++ b/test/unit/plugins/providers/hyperv/config_test.rb
@@ -13,7 +13,7 @@ describe VagrantPlugins::HyperV::Config do
       subject.finalize!
       expect(subject.ip_address_timeout).to eq(120)
     end
-
+  end
   describe "#vlan_id" do
     it "can be set" do
       subject.vlan_id = 100

From 9d50f72df364096c3854481c2d1fa62ba55a4e85 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jeff@classbug.com>
Date: Sun, 22 Mar 2015 17:47:55 -0700
Subject: [PATCH 037/165] For SMB on Linux guests, specify the user's domain as
 a separate parameter to the mount command. This is more reliable than passing
 user@domain as the username. This is not needed for SMB on Windows guests as
 they expect the user@domain form.

This does not change how it is configured in the Vagrantfile.

Fixes #3620
---
 .../linux/cap/mount_smb_shared_folder.rb      |  6 ++-
 .../linux/cap/mount_shared_folder_test.rb     | 44 +++++++++++++++++++
 .../docs/source/v2/synced-folders/smb.html.md |  4 +-
 3 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb

diff --git a/plugins/guests/linux/cap/mount_smb_shared_folder.rb b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
index 424982520..ca14cf148 100644
--- a/plugins/guests/linux/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/linux/cap/mount_smb_shared_folder.rb
@@ -27,10 +27,14 @@ module VagrantPlugins
 
           smb_password = Shellwords.shellescape(options[:smb_password])
 
+          # If a domain is provided in the username, separate it
+          username, domain = (options[:smb_username] || '').split('@', 2)
+
           options[:mount_options] ||= []
           options[:mount_options] << "sec=ntlm"
-          options[:mount_options] << "username=#{options[:smb_username]}"
+          options[:mount_options] << "username=#{username}"
           options[:mount_options] << "pass=#{smb_password}"
+          options[:mount_options] << "domain=#{domain}" if domain
 
           # First mount command uses getent to get the group
           mount_options = "-o uid=#{mount_uid},gid=#{mount_gid}"
diff --git a/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
new file mode 100644
index 000000000..4d591e7fb
--- /dev/null
+++ b/test/unit/plugins/guests/linux/cap/mount_shared_folder_test.rb
@@ -0,0 +1,44 @@
+require File.expand_path("../../../../../base", __FILE__)
+
+describe "VagrantPlugins::GuestLinux::Cap::MountSharedFolder" do
+  let(:machine) { double("machine") }
+  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:guest) { double("guest") }
+
+  before do
+    allow(machine).to receive(:guest).and_return(guest)
+    allow(machine).to receive(:communicate).and_return(communicator)
+    allow(guest).to receive(:capability).and_return(nil)
+  end
+
+  describe "smb" do
+    let(:described_class) do
+      VagrantPlugins::GuestLinux::Plugin.components.guest_capabilities[:linux].get(:mount_smb_shared_folder)
+    end
+
+    describe ".mount_shared_folder" do
+      describe "with a domain" do
+        let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group  | cut -d: -f3`,sec=ntlm,username=user,pass=pass,domain=domain //host/name " }
+        before do
+          communicator.expect_command mount_command
+          communicator.stub_command mount_command, exit_code: 0
+        end
+        after { communicator.verify_expectations! }
+        it "should call mount with correct args" do
+          described_class.mount_smb_shared_folder(machine, 'name', 'guestpath', {:smb_username => "user@domain", :smb_password => "pass", :smb_host => "host"})
+        end
+      end
+      describe "without a domain" do
+        let(:mount_command) { "mount -t cifs -o uid=`id -u `,gid=`getent group  | cut -d: -f3`,sec=ntlm,username=user,pass=pass //host/name " }
+        before do
+          communicator.expect_command mount_command
+          communicator.stub_command mount_command, exit_code: 0
+        end
+        after { communicator.verify_expectations! }
+        it "should call mount with correct args" do
+          described_class.mount_smb_shared_folder(machine, 'name', 'guestpath', {:smb_username => "user", :smb_password => "pass", :smb_host => "host"})
+        end
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/website/docs/source/v2/synced-folders/smb.html.md b/website/docs/source/v2/synced-folders/smb.html.md
index 130a7dabf..b79ff50aa 100644
--- a/website/docs/source/v2/synced-folders/smb.html.md
+++ b/website/docs/source/v2/synced-folders/smb.html.md
@@ -49,8 +49,8 @@ The SMB synced folder type has a variety of options it accepts:
 * `smb_username` (string) - The username used for authentication to mount
   the SMB mount. This is the username to access the mount, _not_ the username
   of the account where the folder is being mounted to. This is usually your
-  Windows username. If this isn't specified, Vagrant will prompt you for
-  it.
+  Windows username. If you sign into a domain, specify it as `user@domain`.
+  If this option isn't specified, Vagrant will prompt you for it.
 
 ## Example
 

From e72d03cfc6b1dd36b02ce3404d00c1a674677de8 Mon Sep 17 00:00:00 2001
From: Brian Dwyer <bdwyer@ieee.org>
Date: Tue, 31 Mar 2015 18:20:42 -0400
Subject: [PATCH 038/165] VMware Documentation Fix - SED Syntax

we should only create the backup file on the first `sed` modification. The second `sed` operation will create a backup with the changes from the first `sed` operation.
---
 website/docs/source/v2/vmware/kernel-upgrade.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/vmware/kernel-upgrade.html.md b/website/docs/source/v2/vmware/kernel-upgrade.html.md
index 9b998ba33..b91986730 100644
--- a/website/docs/source/v2/vmware/kernel-upgrade.html.md
+++ b/website/docs/source/v2/vmware/kernel-upgrade.html.md
@@ -25,7 +25,7 @@ enable auto-upgrading:
 # when we update the linux images
 $fix_vmware_tools_script = <<SCRIPT
 sed -i.bak 's/answer AUTO_KMODS_ENABLED_ANSWER no/answer AUTO_KMODS_ENABLED_ANSWER yes/g' /etc/vmware-tools/locations
-sed -i.bak 's/answer AUTO_KMODS_ENABLED no/answer AUTO_KMODS_ENABLED yes/g' /etc/vmware-tools/locations
+sed -i 's/answer AUTO_KMODS_ENABLED no/answer AUTO_KMODS_ENABLED yes/g' /etc/vmware-tools/locations
 SCRIPT
 
 Vagrant.configure(2) do |config|

From ca3cb385d4b4ab957805a3fe08ef70844b57cbcf Mon Sep 17 00:00:00 2001
From: wucheng <jacky.wucheng@gmail.com>
Date: Thu, 2 Apr 2015 14:44:11 +0800
Subject: [PATCH 039/165] fix ftp push check bug

list method is not safe to check if a dir exist or not on remote.
---
 plugins/pushes/ftp/adapter.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/pushes/ftp/adapter.rb b/plugins/pushes/ftp/adapter.rb
index 8a9414376..b4c4f48f2 100644
--- a/plugins/pushes/ftp/adapter.rb
+++ b/plugins/pushes/ftp/adapter.rb
@@ -74,7 +74,7 @@ module VagrantPlugins
 
         # Create the parent directories if they does not exist (naive mkdir -p)
         fullpath.descend do |path|
-          if @server.list(path.to_s).empty?
+          unless check_dir_exists? path.to_s
             @server.mkdir(path.to_s)
           end
         end
@@ -83,6 +83,15 @@ module VagrantPlugins
         @server.putbinaryfile(local, remote)
       end
 
+      def check_dir_exists?(path)
+        begin
+          @server.chdir(path)
+          return true
+        rescue Net::FTPPermError
+          return false
+        end
+      end
+
       private
 
       def pwd

From 13d4899d16ad658d09bb0dc499ea9d32b3b54ddb Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 2 Apr 2015 10:11:41 -0400
Subject: [PATCH 040/165] Cleanup style

---
 plugins/pushes/ftp/adapter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/pushes/ftp/adapter.rb b/plugins/pushes/ftp/adapter.rb
index b4c4f48f2..d0d076491 100644
--- a/plugins/pushes/ftp/adapter.rb
+++ b/plugins/pushes/ftp/adapter.rb
@@ -74,7 +74,7 @@ module VagrantPlugins
 
         # Create the parent directories if they does not exist (naive mkdir -p)
         fullpath.descend do |path|
-          unless check_dir_exists? path.to_s
+          if !directory_exists?(path.to_s)
             @server.mkdir(path.to_s)
           end
         end
@@ -83,7 +83,7 @@ module VagrantPlugins
         @server.putbinaryfile(local, remote)
       end
 
-      def check_dir_exists?(path)
+      def directory_exists?(path)
         begin
           @server.chdir(path)
           return true

From fa3efaa8669d0e85285582610ec5646cd0f0e477 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Thu, 2 Apr 2015 10:12:20 -0400
Subject: [PATCH 041/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 979ad1cf6..dcb3f8ff8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -40,6 +40,7 @@ BUG FIXES:
   - provisioners/chef-zero: support more chef-zero/local mode attributes [GH-5339]
   - provisioners/docker: use docker.com instead of docker.io [GH-5216]
   - pushes/atlas: send additional box metadata [GH-5283]
+  - pushes/ftp: improve check for remote directory existence [GH-5549]
   - synced\_folders/rsync: add `IdentitiesOnly=yes` to the rsync command. [GH-5175]
   - virtualbox/config: fix misleading error message for private_network [GH-5536, GH-5418]
 

From 415837c54435f659a4005222895ef28d006af7ba Mon Sep 17 00:00:00 2001
From: Jean-Francois Bibeau <jean-francois.bibeau@alcatel-lucent.com>
Date: Mon, 6 Apr 2015 16:51:55 -0400
Subject: [PATCH 042/165] moved function to platform utils, added unit test as
 per @sethvargo

---
 lib/vagrant/util/platform.rb                       | 7 +++++++
 plugins/providers/virtualbox/driver/version_4_3.rb | 6 +++++-
 test/unit/vagrant/util/platform_test.rb            | 6 ++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index c452eb295..fc6c4d5e0 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -144,6 +144,13 @@ module Vagrant
           path
         end
 
+        # Converts a given path to UNC format by adding a prefix and converting slashes.
+        # @param [String] path Path to convert to UNC for Windows
+        # @return [String]
+        def windows_unc_path(path)
+          "//?/" + path.gsub("/", "\\")
+        end
+
         # Returns a boolean noting whether the terminal supports color.
         # output.
         def terminal_supports_colors?
diff --git a/plugins/providers/virtualbox/driver/version_4_3.rb b/plugins/providers/virtualbox/driver/version_4_3.rb
index 81f2252b6..07c17cef8 100644
--- a/plugins/providers/virtualbox/driver/version_4_3.rb
+++ b/plugins/providers/virtualbox/driver/version_4_3.rb
@@ -496,10 +496,14 @@ module VagrantPlugins
 
         def share_folders(folders)
           folders.each do |folder|
+            hostpath = folder[:hostpath]
+            if Vagrant::Util::Platform.windows?
+              hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath)
+            end
             args = ["--name",
               folder[:name],
               "--hostpath",
-              Vagrant::Util::Platform.windows? ? ("//?/" + File.expand_path(folder[:hostpath])).gsub("/","\\") : folder[:hostpath]]
+              hostpath]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             # Enable symlinks on the shared folder
diff --git a/test/unit/vagrant/util/platform_test.rb b/test/unit/vagrant/util/platform_test.rb
index 3e980937f..ac0960afc 100644
--- a/test/unit/vagrant/util/platform_test.rb
+++ b/test/unit/vagrant/util/platform_test.rb
@@ -10,4 +10,10 @@ describe Vagrant::Util::Platform do
       expect(described_class.fs_real_path("c:/foo").to_s).to eql("C:/foo")
     end
   end
+
+  describe "#windows_unc_path" do
+    it "correctly converts a path" do
+      expect(described_class.windows_unc_path("c:/foo").to_s).to eql("//?/c:\\foo")
+    end
+  end
 end

From c0f43c362ce53eca12f755822970c84518e99e6b Mon Sep 17 00:00:00 2001
From: Brandon Matthews <bmatt@luciddg.com>
Date: Fri, 10 Apr 2015 10:06:21 -0700
Subject: [PATCH 043/165] Use service command to restart docker, not upstart.

upstart ships by default on Ubuntu, but not on Debian, and service works
everywhere. Fixes #5245.
---
 .../docker/cap/debian/docker_configure_auto_start.rb           | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb
index 1c29d7d6c..32a8defd2 100644
--- a/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_configure_auto_start.rb
@@ -7,8 +7,7 @@ module VagrantPlugins
             machine.communicate.tap do |comm|
               if !comm.test('grep -q \'\-r=true\' /etc/default/docker')
                 comm.sudo("echo 'DOCKER_OPTS=\"-r=true ${DOCKER_OPTS}\"' >> /etc/default/docker")
-                comm.sudo("stop docker")
-                comm.sudo("start docker")
+                comm.sudo("service docker restart")
 
                 # Wait some amount time for the pid to become available
                 # so that we don't start executing Docker commands until

From 27f323ed5afadc6df2f47edd60064d3886ad15f7 Mon Sep 17 00:00:00 2001
From: Stoned Elipot <stoned.elipot@gmail.com>
Date: Sat, 11 Apr 2015 14:32:05 +0200
Subject: [PATCH 044/165] Fix message provision / disabled_by_config

---
 templates/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f5de5b2c0..d34d408ce 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1696,7 +1696,7 @@ en:
         provision:
           beginning: "Running provisioner: %{provisioner}..."
           disabled_by_config: |-
-            Machine not provisioning because `--no-provision` is specified.
+            Machine not provisioned because `--no-provision` is specified.
           disabled_by_sentinel: |-
             Machine already provisioned. Run `vagrant provision` or use the `--provision`
             to force provisioning. Provisioners marked to run always will still run.

From 3a2a9a3b948f1dc7f8dc7a49494e4c48eaf5a5e6 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sat, 11 Apr 2015 23:35:25 -0700
Subject: [PATCH 045/165] Add a binary_path option to the puppet provisioner to
 match the chef provisioner, and support new puppet 4 install location.

---
 plugins/provisioners/puppet/config/puppet.rb  |  9 ++++++-
 .../provisioners/puppet/provisioner/puppet.rb | 25 +++++++++++++------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index eccd5f780..0e4fabaeb 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -1,7 +1,12 @@
 module VagrantPlugins
   module Puppet
     module Config
-      class Puppet < Vagrant.plugin("2", :config)
+      class Puppet < Vagrant.plugin("2", :config)        
+
+        # The path to Puppet's bin/ directory.
+        # @return [String]
+        attr_accessor :binary_path
+
         attr_accessor :facter
         attr_accessor :hiera_config_path
         attr_accessor :manifest_file
@@ -17,6 +22,7 @@ module VagrantPlugins
         def initialize
           super
 
+          @binary_path        = UNSET_VALUE
           @hiera_config_path  = UNSET_VALUE
           @manifest_file      = UNSET_VALUE
           @manifests_path     = UNSET_VALUE
@@ -88,6 +94,7 @@ module VagrantPlugins
           @synced_folder_type = nil if @synced_folder_type == UNSET_VALUE
           @temp_dir       = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
           @working_directory = nil if @working_directory == UNSET_VALUE
+          @binary_path        = nil     if @binary_path == UNSET_VALUE
         end
 
         # Returns the module paths as an array of paths expanded relative to the
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 66461af5e..0cd5e8033 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -103,7 +103,7 @@ module VagrantPlugins
           verify_shared_folders(check)
 
           # Verify Puppet is installed and run it
-          verify_binary("puppet")
+          verify_binary(puppet_binary_path("puppet"))
 
           # Upload Hiera configuration if we have it
           @hiera_config_path = nil
@@ -138,12 +138,23 @@ module VagrantPlugins
           end
         end
 
+        # Returns the path to the Puppet binary, taking into account the
+        # `binary_path` configuration option.
+        def puppet_binary_path(binary)
+          return binary if !@config.binary_path
+          return File.join(@config.binary_path, binary)
+        end
+
         def verify_binary(binary)
-          @machine.communicate.sudo(
-            "which #{binary}",
-            error_class: PuppetError,
-            error_key: :not_detected,
-            binary: binary)
+          puts "verify_binary:  #{binary}"
+          if !machine.communicate.test("sh -c 'command -v #{binary}'")
+              @config.binary_path = "/opt/puppetlabs/bin"
+              @machine.communicate.sudo(
+                "test -x /opt/puppetlabs/bin/#{binary}",
+                error_class: PuppetError,
+                error_key: :not_detected,
+                binary: binary)
+          end
         end
 
         def run_puppet_apply
@@ -200,7 +211,7 @@ module VagrantPlugins
             facter = "#{facts.join(" ")} "
           end
 
-          command = "#{facter}puppet apply #{options}"
+          command = "#{facter} #{config.binary_path}/puppet apply #{options}"
           if config.working_directory
             if windows?
               command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}"

From e2c68fc12d2373e755abc3685de7e19d94ced88d Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sat, 11 Apr 2015 23:48:18 -0700
Subject: [PATCH 046/165] Correct environment path config name.

---
 .../provisioners/puppet/provisioner/puppet.rb    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 0cd5e8033..700cc6580 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -32,11 +32,11 @@ module VagrantPlugins
           folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type
           folder_opts[:owner] = "root" if !@config.synced_folder_type
 
-          if @config.environmentpath.is_a?(Array)
+          if @config.environment_path.is_a?(Array)
             # Share the environments directory with the guest
-            if @config.environmentpath[0].to_sym == :host
+            if @config.environment_path[0].to_sym == :host
               root_config.vm.synced_folder(
-                File.expand_path(@config.environmentpath[1], root_path),
+                File.expand_path(@config.environment_path[1], root_path),
                 environments_guest_path, folder_opts)
             end
             parse_environment_metadata()
@@ -87,7 +87,7 @@ module VagrantPlugins
           if @config.manifests_path.is_a?(Array) && @config.manifests_path[0] == :host
             check << manifests_guest_path
           end
-          if @config.environmentpath.is_a?(Array) && @config.environmentpath[0] == :host
+          if @config.environment_path.is_a?(Array) && @config.environment_path[0] == :host
             check << environments_guest_path
           end
           @module_paths.each do |host_path, guest_path|
@@ -129,12 +129,12 @@ module VagrantPlugins
         end
 
         def environments_guest_path
-          if config.environmentpath[0] == :host
+          if config.environment_path[0] == :host
             # The path is on the host, so point to where it is shared
             File.join(config.temp_dir, "environments")
           else
             # The path is on the VM, so just point directly to it
-            config.environmentpath[1]
+            config.environment_path[1]
           end
         end
 
@@ -184,7 +184,7 @@ module VagrantPlugins
 
           options << "--detailed-exitcodes"
 
-          if !config.environmentpath.empty?
+          if !config.environment_path.empty?
             options << "#{environments_guest_path}/#{@config.environment}/manifests"
             options << "--environment #{@config.environment}"
           else
@@ -220,7 +220,7 @@ module VagrantPlugins
             end
           end
 
-          if !config.environmentpath.empty?
+          if !config.environment_path.empty?
             @machine.ui.info(I18n.t(
               "vagrant.provisioners.puppet.running_puppet_env",
               environment: config.environment))

From 3ee47acb42e73fff5e83771b19e5b9e77d09c04c Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 01:18:12 -0700
Subject: [PATCH 047/165] Remove debug output

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 700cc6580..df66f5222 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -146,7 +146,6 @@ module VagrantPlugins
         end
 
         def verify_binary(binary)
-          puts "verify_binary:  #{binary}"
           if !machine.communicate.test("sh -c 'command -v #{binary}'")
               @config.binary_path = "/opt/puppetlabs/bin"
               @machine.communicate.sudo(

From 7a4e7929f84b8b69b10492fac6059c4db22d4716 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 01:18:49 -0700
Subject: [PATCH 048/165] Don't parse env metadata until provisioning time.
 TBD: make it functional

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index df66f5222..0187d9d68 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -39,7 +39,6 @@ module VagrantPlugins
                 File.expand_path(@config.environment_path[1], root_path),
                 environments_guest_path, folder_opts)
             end
-            parse_environment_metadata()
           else
             # Non-Environment mode
             @manifest_file  = File.join(manifests_guest_path, @config.manifest_file)
@@ -114,6 +113,7 @@ module VagrantPlugins
             @machine.communicate.upload(local_hiera_path, @hiera_config_path)
           end
 
+          parse_environment_metadata
           run_puppet_apply
         end
 

From cff7c52716bc2f4ce7c5c2de12dee05b3ca7fd19 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 01:25:40 -0700
Subject: [PATCH 049/165] Use localized error message. Update strings for
 puppet provisioner errors.

---
 plugins/provisioners/puppet/config/puppet.rb |  4 ++--
 templates/locales/en.yml                     | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 0e4fabaeb..37584fa11 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -117,8 +117,8 @@ module VagrantPlugins
           # Calculate the manifests and module paths based on env
           this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
 
-          if environment_path != UNSET_VALUE && manifests_path != UNSET_VALUE
-              errors << "You may not specify both environment_path and manifests_path. Please specify environment and environment_path only"
+          if environment_path != nil && manifests_path != nil
+              errors << I18n.t("vagrant.provisioners.puppet.environment_manifest_conflict")
           end
 
           # Manifests path/file validation
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 5159c6c9a..8ddc475db 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1859,16 +1859,15 @@ en:
 
           %{manifest}
         environment_missing: |-
-          The configured Puppet environment folder '%{environment}' was not found in the 
+          The configured Puppet environment folder %{environment} was not found in the 
           specified environmentpath %{environmentpath}.
           Please specify a path to an existing Puppet directory environment.
+        environment_path_missing: "The environment path specified for Puppet does not exist: %{path}"
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
-        manifest_missing: |-
-          The configured Puppet envrionment is missing. Please specify a path to an
-          existing envrionment file:
-
-          %{environment}
-        manifests_path_missing: "The environment path specified for Puppet does not exist: %{path}"
+        environment_manifest_conflict: |-
+          You may not specify both environment_path and manifests_path. 
+          Please specify environment and environment_path without manifests_path, or
+          manifests_path without environment_path (deprecated).
         missing_shared_folders: |-
           Shared folders that Puppet requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the

From c701bab2538d567602e82b42e8b49224d652c310 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 01:26:41 -0700
Subject: [PATCH 050/165] Properly handle various combinations of Puppet
 options being specified.

---
 plugins/provisioners/puppet/config/puppet.rb  | 29 +++++++++----------
 .../provisioners/puppet/provisioner/puppet.rb |  5 ++--
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 37584fa11..56b7a4a0f 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -61,19 +61,18 @@ module VagrantPlugins
 
           if @environment_path == UNSET_VALUE
             if @manifests_path == UNSET_VALUE
-              if 1  #If puppet 3.4+
-              puts "Puppet 3.4+, manifests_path is unset and environment_path is unset, presuming an environment"
+              if 1  #If both are unset, assume 'environment' mode.
                 @environment_path = [:host, "environments"]
               else
                 @manifests_path = [:host, "manifests"]
               end
             end
 
-            if @manifests_path && !@manifests_path.is_a?(Array)
+            if @manifests_path != UNSET_VALUE && !@manifests_path.is_a?(Array)
               @manifests_path = [:host, @manifests_path]
             end
           else
-            if @environment_path && !@environment_path.is_a?(Array)
+            if @environment_path != UNSET_VALUE && !@environment_path.is_a?(Array)
               @environment_path = [:host, @environment_path]
             end
           end
@@ -88,13 +87,15 @@ module VagrantPlugins
             @environment_path[0] = @environment_path[0].to_sym
             @environment  = "production" if @environment == UNSET_VALUE
             @manifest_file = nil
+            @manifests_path = nil
           end
 
-          @module_path    = nil if @module_path == UNSET_VALUE
-          @synced_folder_type = nil if @synced_folder_type == UNSET_VALUE
-          @temp_dir       = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
-          @working_directory = nil if @working_directory == UNSET_VALUE
           @binary_path        = nil     if @binary_path == UNSET_VALUE
+          @module_path        = nil     if @module_path == UNSET_VALUE
+          @synced_folder_type = nil     if @synced_folder_type == UNSET_VALUE
+          @temp_dir           = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
+          @working_directory  = nil     if @working_directory == UNSET_VALUE
+
         end
 
         # Returns the module paths as an array of paths expanded relative to the
@@ -122,8 +123,7 @@ module VagrantPlugins
           end
 
           # Manifests path/file validation
-          puts "manifests_path is #{manifests_path}"
-          if manifests_path != UNSET_VALUE && manifests_path[0].to_sym == :host
+          if manifests_path != nil && manifests_path[0].to_sym == :host
             expanded_path = Pathname.new(manifests_path[1]).
               expand_path(machine.env.root_path)
             if !expanded_path.directory?
@@ -136,10 +136,8 @@ module VagrantPlugins
                                  manifest: expanded_manifest_file.to_s)
               end
             end
-          end          
-
-          # Environments path/file validation
-          if environment_path != UNSET_VALUE && environment_path[0].to_sym == :host
+          elsif environment_path != nil && environment_path[0].to_sym == :host
+            # Environments path/file validation
             expanded_path = Pathname.new(environment_path[1]).
               expand_path(machine.env.root_path)
             if !expanded_path.directory?
@@ -155,7 +153,7 @@ module VagrantPlugins
             end
           end
 
-          if environment_path == UNSET_VALUE && manifests_path == UNSET_VALUE
+          if environment_path == nil && manifests_path == nil
               errors << "Please specify either a Puppet environment_path + environment (preferred) or manifests_path (deprecated)."
           end          
 
@@ -166,7 +164,6 @@ module VagrantPlugins
                                path: path)
             end
           end
-
           { "puppet provisioner" => errors }
         end
       end
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 0187d9d68..721b5ac3d 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -182,8 +182,7 @@ module VagrantPlugins
           end
 
           options << "--detailed-exitcodes"
-
-          if !config.environment_path.empty?
+          if config.environment_path
             options << "#{environments_guest_path}/#{@config.environment}/manifests"
             options << "--environment #{@config.environment}"
           else
@@ -219,7 +218,7 @@ module VagrantPlugins
             end
           end
 
-          if !config.environment_path.empty?
+          if config.environment_path
             @machine.ui.info(I18n.t(
               "vagrant.provisioners.puppet.running_puppet_env",
               environment: config.environment))

From c8f300e5f57c3f18bf350f08cc1d80cb51c4be1e Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 01:43:19 -0700
Subject: [PATCH 051/165] Correct environment path option to puppet apply.

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 721b5ac3d..08e42500d 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -183,7 +183,7 @@ module VagrantPlugins
 
           options << "--detailed-exitcodes"
           if config.environment_path
-            options << "#{environments_guest_path}/#{@config.environment}/manifests"
+            options << "--environmentpath #{environments_guest_path}/"
             options << "--environment #{@config.environment}"
           else
             options << "--manifestdir #{manifests_guest_path}"

From b40426aca5490bb9741fefd1e41a5b9643f259c1 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 02:16:54 -0700
Subject: [PATCH 052/165] Properly parse out and use the environment's manifest
 file which is specified in environment.con.

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 08e42500d..e8aaea552 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -56,24 +56,21 @@ module VagrantPlugins
           end
         end
 
-        # For convenience, add in any module_paths from the Puppet environment.cfg to the vagrant module_paths
-        # This is needed because puppet apply does not read environment metadata (as of v3.6)
         def parse_environment_metadata
           environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
           if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
             conf = @machine.communicate.sudo("cat #{environment_conf}") do | type, data|
               if type == :stdout
-                #modulepath = $basemodulepath:modules/private:modules/public
-                puts "got line #{data}"
+                # Parse out the environment manifest path since puppet apply doesnt do that for us.
+                if data =~ /\s+manifest\s+=\s(.*)/
+                  @environment_manifest_path = $1
+                  @environment_manifest_path.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
+                end
               end
             end
-            puts "Found an environment cfg at: #{environment_conf} - #{conf}"
-          else
-            puts "env cfg not found, looked for #{environment_conf}"
           end
         end
 
-
         def provision
           # If the machine has a wait for reboot functionality, then
           # do that (primarily Windows)
@@ -87,6 +84,7 @@ module VagrantPlugins
             check << manifests_guest_path
           end
           if @config.environment_path.is_a?(Array) && @config.environment_path[0] == :host
+            @environment_manifest_path = "#{environments_guest_path}/#{@config.environment}/manifests/site.pp"
             check << environments_guest_path
           end
           @module_paths.each do |host_path, guest_path|
@@ -183,6 +181,7 @@ module VagrantPlugins
 
           options << "--detailed-exitcodes"
           if config.environment_path
+            options << " #{@environment_manifest_path}"
             options << "--environmentpath #{environments_guest_path}/"
             options << "--environment #{@config.environment}"
           else

From 0efb9a393245f88aaff7e676442a1b7352c8e42d Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 12:29:50 -0700
Subject: [PATCH 053/165] Fix resolution of puppet path for <4.0

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index e8aaea552..b205b6b79 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -145,12 +145,12 @@ module VagrantPlugins
 
         def verify_binary(binary)
           if !machine.communicate.test("sh -c 'command -v #{binary}'")
-              @config.binary_path = "/opt/puppetlabs/bin"
-              @machine.communicate.sudo(
-                "test -x /opt/puppetlabs/bin/#{binary}",
-                error_class: PuppetError,
-                error_key: :not_detected,
-                binary: binary)
+            @config.binary_path = "/opt/puppetlabs/bin/"
+            @machine.communicate.sudo(
+              "test -x /opt/puppetlabs/bin/#{binary}",
+              error_class: PuppetError,
+              error_key: :not_detected,
+              binary: binary)
           end
         end
 
@@ -208,7 +208,7 @@ module VagrantPlugins
             facter = "#{facts.join(" ")} "
           end
 
-          command = "#{facter} #{config.binary_path}/puppet apply #{options}"
+          command = "#{facter} #{config.binary_path}puppet apply #{options}"
           if config.working_directory
             if windows?
               command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}"

From ffcb58bcd90a2221bdd338c2181fd5c1f334247b Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Sun, 12 Apr 2015 12:31:31 -0700
Subject: [PATCH 054/165] When using environments, allow specifying the 'main
 manifest' using manifest_path and manifest_file.

---
 plugins/provisioners/puppet/config/puppet.rb  | 38 ++++++++-----------
 .../provisioners/puppet/provisioner/puppet.rb | 20 +++++-----
 templates/locales/en.yml                      |  4 --
 3 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 56b7a4a0f..99b06face 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -59,24 +59,18 @@ module VagrantPlugins
         def finalize!
           super
 
-          if @environment_path == UNSET_VALUE
-            if @manifests_path == UNSET_VALUE
-              if 1  #If both are unset, assume 'environment' mode.
-                @environment_path = [:host, "environments"]
-              else
-                @manifests_path = [:host, "manifests"]
-              end
-            end
-
-            if @manifests_path != UNSET_VALUE && !@manifests_path.is_a?(Array)
-              @manifests_path = [:host, @manifests_path]
-            end
-          else
-            if @environment_path != UNSET_VALUE && !@environment_path.is_a?(Array)
-              @environment_path = [:host, @environment_path]
-            end
+          if @environment_path == UNSET_VALUE && @manifests_path == UNSET_VALUE
+            #If both are unset, assume 'manifests' mode for now. TBD: Switch to environments by default?
+            @manifests_path = [:host, "manifests"]
           end
 
+          # If the paths are just strings, assume they are 'host' paths (rather than guest)
+          if @environment_path != UNSET_VALUE && !@environment_path.is_a?(Array)
+            @environment_path = [:host, @environment_path]
+          end
+          if @manifests_path != UNSET_VALUE && !@manifests_path.is_a?(Array)
+            @manifests_path = [:host, @manifests_path]
+          end
           @hiera_config_path = nil if @hiera_config_path == UNSET_VALUE
 
           if @environment_path == UNSET_VALUE
@@ -86,8 +80,12 @@ module VagrantPlugins
           else
             @environment_path[0] = @environment_path[0].to_sym
             @environment  = "production" if @environment == UNSET_VALUE
-            @manifest_file = nil
-            @manifests_path = nil
+            if @manifests_path == UNSET_VALUE
+              @manifests_path = nil
+            end            
+            if @manifest_file == UNSET_VALUE
+              @manifest_file = nil
+            end
           end
 
           @binary_path        = nil     if @binary_path == UNSET_VALUE
@@ -118,10 +116,6 @@ module VagrantPlugins
           # Calculate the manifests and module paths based on env
           this_expanded_module_paths = expanded_module_paths(machine.env.root_path)
 
-          if environment_path != nil && manifests_path != nil
-              errors << I18n.t("vagrant.provisioners.puppet.environment_manifest_conflict")
-          end
-
           # Manifests path/file validation
           if manifests_path != nil && manifests_path[0].to_sym == :host
             expanded_path = Pathname.new(manifests_path[1]).
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index b205b6b79..e68f8fa85 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -39,8 +39,8 @@ module VagrantPlugins
                 File.expand_path(@config.environment_path[1], root_path),
                 environments_guest_path, folder_opts)
             end
-          else
-            # Non-Environment mode
+          end
+          if @config.manifest_file
             @manifest_file  = File.join(manifests_guest_path, @config.manifest_file)
             # Share the manifests directory with the guest
             if @config.manifests_path[0].to_sym == :host
@@ -63,8 +63,8 @@ module VagrantPlugins
               if type == :stdout
                 # Parse out the environment manifest path since puppet apply doesnt do that for us.
                 if data =~ /\s+manifest\s+=\s(.*)/
-                  @environment_manifest_path = $1
-                  @environment_manifest_path.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
+                  @manifest_file = $1
+                  @manifest_file.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
                 end
               end
             end
@@ -78,13 +78,17 @@ module VagrantPlugins
             @machine.guest.capability(:wait_for_reboot)
           end
 
+          # In environment mode we still need to specify a manifest file, if its not, use the one from env config if specified.
+          if !@manifest_file
+            @manifest_file = "#{environments_guest_path}/#{@config.environment}/manifests/site.pp"
+            parse_environment_metadata
+          end
           # Check that the shared folders are properly shared
           check = []
           if @config.manifests_path.is_a?(Array) && @config.manifests_path[0] == :host
             check << manifests_guest_path
           end
           if @config.environment_path.is_a?(Array) && @config.environment_path[0] == :host
-            @environment_manifest_path = "#{environments_guest_path}/#{@config.environment}/manifests/site.pp"
             check << environments_guest_path
           end
           @module_paths.each do |host_path, guest_path|
@@ -111,7 +115,6 @@ module VagrantPlugins
             @machine.communicate.upload(local_hiera_path, @hiera_config_path)
           end
 
-          parse_environment_metadata
           run_puppet_apply
         end
 
@@ -181,15 +184,14 @@ module VagrantPlugins
 
           options << "--detailed-exitcodes"
           if config.environment_path
-            options << " #{@environment_manifest_path}"
             options << "--environmentpath #{environments_guest_path}/"
             options << "--environment #{@config.environment}"
           else
             options << "--manifestdir #{manifests_guest_path}"
-            options << @manifest_file
           end
+
+          options << @manifest_file
           options = options.join(" ")
-          
           @machine.ui.info("Running ye puppet apply with options #{options}")
 
           # Build up the custom facts if we have any
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 8ddc475db..f3782cdbf 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1864,10 +1864,6 @@ en:
           Please specify a path to an existing Puppet directory environment.
         environment_path_missing: "The environment path specified for Puppet does not exist: %{path}"
         manifests_path_missing: "The manifests path specified for Puppet does not exist: %{path}"
-        environment_manifest_conflict: |-
-          You may not specify both environment_path and manifests_path. 
-          Please specify environment and environment_path without manifests_path, or
-          manifests_path without environment_path (deprecated).
         missing_shared_folders: |-
           Shared folders that Puppet requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the

From 2f816693942e5ed3eae93156e7a502a6c210aaa9 Mon Sep 17 00:00:00 2001
From: Aaron Quint <aaron@quirkey.com>
Date: Mon, 13 Apr 2015 13:45:17 -0400
Subject: [PATCH 055/165] Move shell_cmd to a method in SSH::Communicator

This allows shell_cmd to be overridable by plugins/patches without
having to override the entire (large) shell_execute method
---
 plugins/communicators/ssh/communicator.rb | 25 +++++++++++++++--------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 64455042b..4109a66ff 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -434,6 +434,21 @@ module VagrantPlugins
         return yield connection if block_given?
       end
 
+      # The shell wrapper command used in shell_execute defined by
+      # the sudo and shell options.
+      def shell_cmd(opts)
+        sudo  = opts[:sudo]
+        shell = opts[:shell]
+        
+        # Determine the shell to execute. Prefer the explicitly passed in shell
+        # over the default configured shell. If we are using `sudo` then we
+        # need to wrap the shell in a `sudo` call.
+        cmd = @machine.config.ssh.shell
+        cmd = shell if shell
+        cmd = "sudo -E -H #{cmd}" if sudo
+        cmd
+      end
+
       # Executes the command on an SSH connection within a login shell.
       def shell_execute(connection, command, **opts)
         opts = {
@@ -442,18 +457,10 @@ module VagrantPlugins
         }.merge(opts)
 
         sudo  = opts[:sudo]
-        shell = opts[:shell]
 
         @logger.info("Execute: #{command} (sudo=#{sudo.inspect})")
         exit_status = nil
 
-        # Determine the shell to execute. Prefer the explicitly passed in shell
-        # over the default configured shell. If we are using `sudo` then we
-        # need to wrap the shell in a `sudo` call.
-        shell_cmd = @machine.config.ssh.shell
-        shell_cmd = shell if shell
-        shell_cmd = "sudo -E -H #{shell_cmd}" if sudo
-
         # These variables are used to scrub PTY output if we're in a PTY
         pty = false
         pty_stdout = ""
@@ -472,7 +479,7 @@ module VagrantPlugins
             end
           end
 
-          ch.exec(shell_cmd) do |ch2, _|
+          ch.exec(shell_cmd(opts)) do |ch2, _|
             # Setup the channel callbacks so we can get data and exit status
             ch2.on_data do |ch3, data|
               # Filter out the clear screen command

From ef45f7c52efeb6e4e98e5af841d966d052a0bd11 Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@chartio.com>
Date: Mon, 13 Apr 2015 12:57:58 -0700
Subject: [PATCH 056/165] Add documentation for salt bootstrap script config
 parameter.

---
 website/docs/source/v2/provisioning/salt.html.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 4e832fb8e..8bb012aa7 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -65,6 +65,7 @@ you can specify a branch, tag, or any treeish. Not supported on Windows.
 * `always_install`   (boolean) - Installs salt binaries even
  if they are already detected, default `false`
 
+* `bootstrap_script` (string) - Path to your customized salt-bootstrap.sh script.
 
 * `bootstrap_options` (string) - Additional command-line options to
   pass to the bootstrap script.

From 9de3c481debc1b9c3327a885a77c4c6410d8adc1 Mon Sep 17 00:00:00 2001
From: Shawn Neal <sneal@sneal.net>
Date: Tue, 14 Apr 2015 05:57:16 -0700
Subject: [PATCH 057/165] Salt bootstrap ps1 should be idempotent

- WinRM communicator error detection was tightened up thus exposing an issue in the salt bootstrap script creating directories that already exist.
---
 plugins/provisioners/salt/bootstrap-salt.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/salt/bootstrap-salt.ps1 b/plugins/provisioners/salt/bootstrap-salt.ps1
index c8d7e7ab2..e0bd34d28 100644
--- a/plugins/provisioners/salt/bootstrap-salt.ps1
+++ b/plugins/provisioners/salt/bootstrap-salt.ps1
@@ -2,10 +2,10 @@
 $version = '2014.1.10'
 
 # Create C:\tmp\ - if Vagrant doesn't upload keys and/or config it might not exist
-New-Item C:\tmp\ -ItemType directory | out-null
+New-Item C:\tmp\ -ItemType directory -force | out-null
 
 # Copy minion keys & config to correct location
-New-Item C:\salt\conf\pki\minion\ -ItemType directory | out-null
+New-Item C:\salt\conf\pki\minion\ -ItemType directory -force | out-null
 
 # Check if minion keys have been uploaded
 if (Test-Path C:\tmp\minion.pem) {

From 602227ca7df1547af3590c0a4179beb40fea9d4c Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Thu, 16 Apr 2015 00:50:53 -0700
Subject: [PATCH 058/165] Remove debug spam from development.

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index e68f8fa85..e2c7b17e1 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -192,7 +192,6 @@ module VagrantPlugins
 
           options << @manifest_file
           options = options.join(" ")
-          @machine.ui.info("Running ye puppet apply with options #{options}")
 
           # Build up the custom facts if we have any
           facter = ""

From 45e14a8dc45cb56b8f50acffb3a6490aa953aec1 Mon Sep 17 00:00:00 2001
From: Jean-Francois Bibeau <jean-francois.bibeau@alcatel-lucent.com>
Date: Thu, 16 Apr 2015 11:02:58 -0400
Subject: [PATCH 059/165] UNC paths should have backslashes, not front-slashes.

---
 lib/vagrant/util/platform.rb            | 2 +-
 test/unit/vagrant/util/platform_test.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/util/platform.rb b/lib/vagrant/util/platform.rb
index fc6c4d5e0..706445c3b 100644
--- a/lib/vagrant/util/platform.rb
+++ b/lib/vagrant/util/platform.rb
@@ -148,7 +148,7 @@ module Vagrant
         # @param [String] path Path to convert to UNC for Windows
         # @return [String]
         def windows_unc_path(path)
-          "//?/" + path.gsub("/", "\\")
+          "\\\\?\\" + path.gsub("/", "\\")
         end
 
         # Returns a boolean noting whether the terminal supports color.
diff --git a/test/unit/vagrant/util/platform_test.rb b/test/unit/vagrant/util/platform_test.rb
index ac0960afc..ae51076ec 100644
--- a/test/unit/vagrant/util/platform_test.rb
+++ b/test/unit/vagrant/util/platform_test.rb
@@ -13,7 +13,7 @@ describe Vagrant::Util::Platform do
 
   describe "#windows_unc_path" do
     it "correctly converts a path" do
-      expect(described_class.windows_unc_path("c:/foo").to_s).to eql("//?/c:\\foo")
+      expect(described_class.windows_unc_path("c:/foo").to_s).to eql("\\\\?\\c:\\foo")
     end
   end
 end

From 0962a2d151b0114a22410cdef2784c1a649c7cd3 Mon Sep 17 00:00:00 2001
From: Haz <haoran@untoyou.net>
Date: Fri, 17 Apr 2015 12:34:40 +1000
Subject: [PATCH 060/165] Update ssh.rb to detect PLink v0.64

PLink 0.64 (released 28-2-2015) changes the command-line description, so the previous text-match no longer works.
---
 lib/vagrant/util/ssh.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/util/ssh.rb b/lib/vagrant/util/ssh.rb
index 0a71613c7..586c66c6d 100644
--- a/lib/vagrant/util/ssh.rb
+++ b/lib/vagrant/util/ssh.rb
@@ -83,7 +83,7 @@ module Vagrant
         # underneath the covers. In this case, we tell the user.
         if Platform.windows?
           r = Subprocess.execute(ssh_path)
-          if r.stdout.include?("PuTTY Link")
+          if r.stdout.include?("PuTTY Link") || r.stdout.include?("Plink: command-line connection utility")
             raise Errors::SSHIsPuttyLink,
               host: ssh_info[:host],
               port: ssh_info[:port],

From b16b85aa7dd0679e1ee310718ef6d581e71b16e3 Mon Sep 17 00:00:00 2001
From: James Shubin <james@shubin.ca>
Date: Sat, 18 Apr 2015 00:35:21 -0400
Subject: [PATCH 061/165] Add :name attribute to shell provisioner.

This allows the display of friendly output to the user when we think an
important action should be labeled a certain way. This makes vagrant
output a lot more useful when many inline shell provisioners are
present.
---
 plugins/provisioners/shell/config.rb              |  6 ++++++
 plugins/provisioners/shell/provisioner.rb         | 10 ++++++++--
 website/docs/source/v2/provisioning/shell.html.md |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index e1d046f2d..63f93deee 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -10,6 +10,7 @@ module VagrantPlugins
       attr_accessor :privileged
       attr_accessor :binary
       attr_accessor :keep_color
+      attr_accessor :name
       attr_accessor :powershell_args
 
       def initialize
@@ -20,6 +21,7 @@ module VagrantPlugins
         @privileged  = UNSET_VALUE
         @binary      = UNSET_VALUE
         @keep_color  = UNSET_VALUE
+        @name        = UNSET_VALUE
         @powershell_args  = UNSET_VALUE
       end
 
@@ -31,11 +33,15 @@ module VagrantPlugins
         @privileged  = true if @privileged == UNSET_VALUE
         @binary      = false if @binary == UNSET_VALUE
         @keep_color  = false if @keep_color == UNSET_VALUE
+        @name        = nil if @name == UNSET_VALUE
         @powershell_args  = "-ExecutionPolicy Bypass" if @powershell_args == UNSET_VALUE
 
         if @args && args_valid?
           @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
         end
+        if not(@name.nil?) and not(@name.is_a?(String))
+          @name = nil
+        end
       end
 
       def validate(machine)
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
index 867de7553..e694d1c79 100644
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -65,7 +65,10 @@ module VagrantPlugins
 
             comm.upload(path.to_s, config.upload_path)
 
-            if config.path
+            if not(config.name.nil?)
+              @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
+                                      script: "Name: #{config.name}"))
+            elsif config.path
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
                                       script: path.to_s))
             else
@@ -122,7 +125,10 @@ module VagrantPlugins
             command = "powershell #{shell_args.to_s} -file #{command}" if
               File.extname(exec_path).downcase == '.ps1'
 
-            if config.path
+            if not(config.name.nil?)
+              @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
+                                      script: "Name: #{config.name}"))
+            elsif config.path
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.runningas",
                                       local: config.path.to_s, remote: exec_path))
             else
diff --git a/website/docs/source/v2/provisioning/shell.html.md b/website/docs/source/v2/provisioning/shell.html.md
index e46d0ad52..978d8cbda 100644
--- a/website/docs/source/v2/provisioning/shell.html.md
+++ b/website/docs/source/v2/provisioning/shell.html.md
@@ -59,6 +59,9 @@ The remainder of the available options are optional:
   true, Vagrant will not do this, allowing the native colors from the script
   to be outputted.
 
+* `name` (string) - This value will be displayed in the output so that
+  identification by the user is easier when many shell provisioners are present.
+
 * `powershell_args` (string) - Extra arguments to pass to `PowerShell`
   if you're provisioning with PowerShell on Windows.
 

From 21db4470a0c5344933ffa42285fa1588f5676944 Mon Sep 17 00:00:00 2001
From: Fabio Rapposelli <fabio@vmware.com>
Date: Mon, 20 Apr 2015 10:13:21 -0700
Subject: [PATCH 062/165] Add Guest support for VMware Photon.

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
---
 plugins/guests/photon/cap/change_host_name.rb | 15 ++++++++++
 .../guests/photon/cap/configure_networks.rb   | 27 +++++++++++++++++
 plugins/guests/photon/cap/docker.rb           | 11 +++++++
 plugins/guests/photon/guest.rb                |  9 ++++++
 plugins/guests/photon/plugin.rb               | 30 +++++++++++++++++++
 5 files changed, 92 insertions(+)
 create mode 100644 plugins/guests/photon/cap/change_host_name.rb
 create mode 100644 plugins/guests/photon/cap/configure_networks.rb
 create mode 100644 plugins/guests/photon/cap/docker.rb
 create mode 100644 plugins/guests/photon/guest.rb
 create mode 100644 plugins/guests/photon/plugin.rb

diff --git a/plugins/guests/photon/cap/change_host_name.rb b/plugins/guests/photon/cap/change_host_name.rb
new file mode 100644
index 000000000..5249dadba
--- /dev/null
+++ b/plugins/guests/photon/cap/change_host_name.rb
@@ -0,0 +1,15 @@
+module VagrantPlugins
+  module GuestPhoton
+    module Cap
+      class ChangeHostName
+        def self.change_host_name(machine, name)
+          machine.communicate.tap do |comm|
+            unless comm.test("sudo hostname --fqdn | grep '#{name}'")
+              comm.sudo("hostname #{name.split('.')[0]}")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/photon/cap/configure_networks.rb b/plugins/guests/photon/cap/configure_networks.rb
new file mode 100644
index 000000000..5e06f00eb
--- /dev/null
+++ b/plugins/guests/photon/cap/configure_networks.rb
@@ -0,0 +1,27 @@
+require 'tempfile'
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module GuestPhoton
+    module Cap
+      class ConfigureNetworks
+        include Vagrant::Util
+
+        def self.configure_networks(machine, networks)
+          machine.communicate.tap do |comm|
+            # Read network interface names
+            interfaces = []
+            comm.sudo("ifconfig | grep 'eth' | cut -f1 -d' '") do |_, result|
+              interfaces = result.split("\n")
+            end
+
+            # Configure interfaces
+            networks.each do |network|
+              comm.sudo("ifconfig #{interfaces[network[:interface].to_i]} #{network[:ip]} netmask #{network[:netmask]}")
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/photon/cap/docker.rb b/plugins/guests/photon/cap/docker.rb
new file mode 100644
index 000000000..954777908
--- /dev/null
+++ b/plugins/guests/photon/cap/docker.rb
@@ -0,0 +1,11 @@
+module VagrantPlugins
+  module GuestPhoton
+    module Cap
+      module Docker
+        def self.docker_daemon_running(machine)
+          machine.communicate.test('test -S /run/docker.sock')
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/photon/guest.rb b/plugins/guests/photon/guest.rb
new file mode 100644
index 000000000..c33a9f8a2
--- /dev/null
+++ b/plugins/guests/photon/guest.rb
@@ -0,0 +1,9 @@
+module VagrantPlugins
+  module GuestPhoton
+    class Guest < Vagrant.plugin('2', :guest)
+      def detect?(machine)
+        machine.communicate.test("cat /etc/photon-release | grep 'VMware Photon Linux'")
+      end
+    end
+  end
+end
diff --git a/plugins/guests/photon/plugin.rb b/plugins/guests/photon/plugin.rb
new file mode 100644
index 000000000..a56a0f44f
--- /dev/null
+++ b/plugins/guests/photon/plugin.rb
@@ -0,0 +1,30 @@
+require 'vagrant'
+
+module VagrantPlugins
+  module GuestPhoton
+    class Plugin < Vagrant.plugin('2')
+      name 'VMware Photon guest'
+      description 'VMware Photon guest support.'
+
+      guest('photon', 'linux') do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+
+      guest_capability('photon', 'change_host_name') do
+        require_relative 'cap/change_host_name'
+        Cap::ChangeHostName
+      end
+
+      guest_capability('photon', 'configure_networks') do
+        require_relative 'cap/configure_networks'
+        Cap::ConfigureNetworks
+      end
+
+      guest_capability('photon', 'docker_daemon_running') do
+        require_relative 'cap/docker'
+        Cap::Docker
+      end
+    end
+  end
+end

From 90bb760b3bef596e74a81e1dbe30966dd37bfc0d Mon Sep 17 00:00:00 2001
From: Fabio Rapposelli <fabio@vmware.com>
Date: Mon, 20 Apr 2015 14:56:26 -0700
Subject: [PATCH 063/165] Added tests

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
---
 .../guests/photon/cap/configure_networks.rb   | 15 +++++++
 .../photon/cap/change_host_name_test.rb       | 34 ++++++++++++++++
 .../photon/cap/configure_networks_test.rb     | 40 +++++++++++++++++++
 .../plugins/guests/photon/cap/docker_test.rb  | 26 ++++++++++++
 4 files changed, 115 insertions(+)
 create mode 100644 test/unit/plugins/guests/photon/cap/change_host_name_test.rb
 create mode 100644 test/unit/plugins/guests/photon/cap/configure_networks_test.rb
 create mode 100644 test/unit/plugins/guests/photon/cap/docker_test.rb

diff --git a/plugins/guests/photon/cap/configure_networks.rb b/plugins/guests/photon/cap/configure_networks.rb
index 5e06f00eb..50f4737b8 100644
--- a/plugins/guests/photon/cap/configure_networks.rb
+++ b/plugins/guests/photon/cap/configure_networks.rb
@@ -19,6 +19,21 @@ module VagrantPlugins
             networks.each do |network|
               comm.sudo("ifconfig #{interfaces[network[:interface].to_i]} #{network[:ip]} netmask #{network[:netmask]}")
             end
+
+            primary_machine_config = machine.env.active_machines.first
+            primary_machine = machine.env.machine(*primary_machine_config, true)
+
+            get_ip = lambda do |machine|
+              ip = nil
+              machine.config.vm.networks.each do |type, opts|
+                if type == :private_network && opts[:ip]
+                  ip = opts[:ip]
+                  break
+                end
+              end
+
+              ip
+            end
           end
         end
       end
diff --git a/test/unit/plugins/guests/photon/cap/change_host_name_test.rb b/test/unit/plugins/guests/photon/cap/change_host_name_test.rb
new file mode 100644
index 000000000..5e9e9e9e1
--- /dev/null
+++ b/test/unit/plugins/guests/photon/cap/change_host_name_test.rb
@@ -0,0 +1,34 @@
+# encoding: UTF-8
+# Copyright (c) 2015 VMware, Inc. All Rights Reserved.
+
+require File.expand_path("../../../../../base", __FILE__)
+
+describe "VagrantPlugins::GuestPhoton::Cap::ChangeHostName" do
+  let(:described_class) do
+    VagrantPlugins::GuestPhoton::Plugin.components.guest_capabilities[:photon].get(:change_host_name)
+  end
+  let(:machine) { double("machine") }
+  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(communicator)
+  end
+
+  after do
+    communicator.verify_expectations!
+  end
+
+  it 'should change hostname when hostname is differ from current' do
+    hostname = 'vagrant-photon'
+    expect(communicator).to receive(:test).with("sudo hostname --fqdn | grep 'vagrant-photon'")
+    communicator.should_receive(:sudo).with("hostname #{hostname.split('.')[0]}")
+    described_class.change_host_name(machine, hostname)
+  end
+
+  it 'should not change hostname when hostname equals current' do
+    hostname = 'vagrant-photon'
+    communicator.stub(:test).and_return(true)
+    communicator.should_not_receive(:sudo)
+    described_class.change_host_name(machine, hostname)
+  end
+end
diff --git a/test/unit/plugins/guests/photon/cap/configure_networks_test.rb b/test/unit/plugins/guests/photon/cap/configure_networks_test.rb
new file mode 100644
index 000000000..dc6e9aaf1
--- /dev/null
+++ b/test/unit/plugins/guests/photon/cap/configure_networks_test.rb
@@ -0,0 +1,40 @@
+# encoding: UTF-8
+# Copyright (c) 2015 VMware, Inc. All Rights Reserved.
+
+require File.expand_path("../../../../../base", __FILE__)
+
+describe "VagrantPlugins::GuestPhoton::Cap::ConfigureNetworks" do
+  let(:described_class) do
+    VagrantPlugins::GuestPhoton::Plugin.components.guest_capabilities[:photon].get(:configure_networks)
+  end
+  let(:machine) { double("machine") }
+  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(communicator)
+  end
+
+  after do
+    communicator.verify_expectations!
+  end
+
+  it 'should configure networks' do
+    networks = [
+      { :type => :static, :ip => '192.168.10.10', :netmask => '255.255.255.0', :interface => 1, :name => 'eth0' },
+      { :type => :dhcp, :interface => 2, :name => 'eth1' },
+      { :type => :static, :ip => '10.168.10.10', :netmask => '255.255.0.0', :interface => 3, :name => 'docker0' }
+    ]
+    communicator.should_receive(:sudo).with("ifconfig | grep 'eth' | cut -f1 -d' '")
+    communicator.should_receive(:sudo).with('ifconfig  192.168.10.10 netmask 255.255.255.0')
+    communicator.should_receive(:sudo).with('ifconfig   netmask ')
+    communicator.should_receive(:sudo).with('ifconfig  10.168.10.10 netmask 255.255.0.0')
+
+    allow_message_expectations_on_nil
+    machine.should_receive(:env).at_least(5).times
+    machine.env.should_receive(:active_machines).at_least(:twice)
+    machine.env.active_machines.should_receive(:first)
+    machine.env.should_receive(:machine)
+
+    described_class.configure_networks(machine, networks)
+  end
+end
diff --git a/test/unit/plugins/guests/photon/cap/docker_test.rb b/test/unit/plugins/guests/photon/cap/docker_test.rb
new file mode 100644
index 000000000..6a1c726ff
--- /dev/null
+++ b/test/unit/plugins/guests/photon/cap/docker_test.rb
@@ -0,0 +1,26 @@
+# encoding: UTF-8
+# Copyright (c) 2015 VMware, Inc. All Rights Reserved.
+
+require File.expand_path("../../../../../base", __FILE__)
+
+describe "VagrantPlugins::GuestPhoton::Cap::Docker" do
+  let(:described_class) do
+    VagrantPlugins::GuestPhoton::Plugin.components.guest_capabilities[:photon].get(:docker_daemon_running)
+  end
+  let(:machine) { double("machine") }
+  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:old_hostname) { 'oldhostname.olddomain.tld' }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(communicator)
+  end
+
+  after do
+    communicator.verify_expectations!
+  end
+
+  it 'should check docker' do
+    expect(communicator).to receive(:test).with('test -S /run/docker.sock')
+    described_class.docker_daemon_running(machine)
+  end
+end

From 6172bb5abe371e7fe97e7da42d54ad7a8f6265f4 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Mon, 20 Apr 2015 18:17:57 -0400
Subject: [PATCH 064/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcb3f8ff8..60e3a8e16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ IMPROVEMENTS:
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]
+  - guests/photon: Initial support [GH-5612]
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
   - providers/virtualbox: regexp supported for bridge configuration. [GH-5320]

From 744033aa17e50c2d34bbcd6987e8178ccf04fb38 Mon Sep 17 00:00:00 2001
From: Jean-Francois Bibeau <jean-francois.bibeau@alcatel-lucent.com>
Date: Tue, 21 Apr 2015 10:11:18 -0400
Subject: [PATCH 065/165] Added a few undocumented NFS options.

---
 .../docs/source/v2/synced-folders/nfs.html.md | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/website/docs/source/v2/synced-folders/nfs.html.md b/website/docs/source/v2/synced-folders/nfs.html.md
index dbe565b48..b11acb453 100644
--- a/website/docs/source/v2/synced-folders/nfs.html.md
+++ b/website/docs/source/v2/synced-folders/nfs.html.md
@@ -65,6 +65,45 @@ the final part of the `config.vm.synced_folder` definition, along with the
 * `nfs_version` (string | integer) - The NFS protocol version to use when
   mounting the folder on the guest. This defaults to 3.
 
+## Specifying NFS Arguments
+
+In addition to the options specified above, it is possible for Vagrant to
+specify additional NFS arguments when mounting the NFS share by using the
+`mount_options` key. For example, to append the `actimeo=2` client mount option:
+
+```
+config.vm.synced_folder ".", "/vagrant",
+    :nfs => true,
+    :mount_options => ['actimeo=2']
+```
+
+This would result in the following `mount` command being executed on the guest:
+ 
+```
+mount -o 'actimeo=2' 172.28.128.1:'/path/to/vagrantfile' /vagrant
+```
+
+You can also tweak the arguments specified in the `/etc/exports` template
+when the mount is added, by using the OS-specific `linux__nfs_options` or
+`bsd__nfs_options` keys. Note that these options completely override the default
+arguments that are added by Vagrant automatically. For example, to make the
+NFS share asynchronous:
+
+```
+config.vm.synced_folder ".", "/vagrant",
+    :nfs => true,
+    :linux__nfs_options => ['rw','no_subtree_check','all_squash','async']
+```
+
+This would result in the following content in `/etc/exports` on the host (note
+the added `async` flag):
+
+```
+# VAGRANT-BEGIN: 21171 5b8f0135-9e73-4166-9bfd-ac43d5f14261
+"/path/to/vagrantfile" 172.28.128.5(rw,no_subtree_check,all_squash,async,anonuid=21171,anongid=660,fsid=3382034405)
+# VAGRANT-END: 21171 5b8f0135-9e73-4166-9bfd-ac43d5f14261
+```
+
 ## Root Privilege Requirement
 
 To configure NFS, Vagrant must modify system files on the host. Therefore,

From a9b8139755b748c7fad81133414440d343f3bf8d Mon Sep 17 00:00:00 2001
From: Tiago Mendes-Costa <tiago@mendes-costa.net>
Date: Tue, 21 Apr 2015 20:48:34 +0200
Subject: [PATCH 066/165] Added change_host_name capability for tinycore.

---
 plugins/guests/tinycore/plugin.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/guests/tinycore/plugin.rb b/plugins/guests/tinycore/plugin.rb
index b7553fa0a..3febbb16f 100644
--- a/plugins/guests/tinycore/plugin.rb
+++ b/plugins/guests/tinycore/plugin.rb
@@ -16,6 +16,11 @@ module VagrantPlugins
         Cap::ConfigureNetworks
       end
 
+      guest_capability("tinycore", "change_host_name") do
+        require_relative "cap/change_host_name"
+        Cap::ChangeHostName
+      end
+
       guest_capability("tinycore", "halt") do
         require_relative "cap/halt"
         Cap::Halt

From 0b588e365675570e5206ece2290b7ad1cf4284f9 Mon Sep 17 00:00:00 2001
From: bmx0r <michael.boutillier@gmail.com>
Date: Tue, 21 Apr 2015 21:04:40 +0200
Subject: [PATCH 067/165] Remove useless line

/usr/bin/sethostname will change /etc/hostname, useless to do it twice
---
 plugins/guests/tinycore/cap/change_host_name.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/guests/tinycore/cap/change_host_name.rb b/plugins/guests/tinycore/cap/change_host_name.rb
index 2c16af362..1c4ec8590 100644
--- a/plugins/guests/tinycore/cap/change_host_name.rb
+++ b/plugins/guests/tinycore/cap/change_host_name.rb
@@ -4,7 +4,6 @@ module VagrantPlugins
       class ChangeHostName
         def self.change_host_name(machine, name)
           if !machine.communicate.test("hostname | grep '^#{name}$'")
-            machine.communicate.sudo("sh -c 'echo \"#{name}\" > /etc/hostname'")
             machine.communicate.sudo("/usr/bin/sethostname #{name}")
           end
         end

From 36f89afbdf1e64d13d560d82bfa65661a1e10820 Mon Sep 17 00:00:00 2001
From: Tiago Mendes-Costa <tiago@mendes-costa.net>
Date: Wed, 22 Apr 2015 16:12:46 +0200
Subject: [PATCH 068/165] Added unit test for tinycore change_host_name.

---
 .../tinycore/cap/change_host_name_test.rb     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb

diff --git a/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb b/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb
new file mode 100644
index 000000000..ba258261f
--- /dev/null
+++ b/test/unit/plugins/guests/tinycore/cap/change_host_name_test.rb
@@ -0,0 +1,26 @@
+require File.expand_path("../../../../../base", __FILE__)
+
+describe "VagrantPlugins::GuestTinyCore::Cap::ChangeHostName" do
+  let(:described_class) do
+    VagrantPlugins::GuestTinyCore::Plugin.components.guest_capabilities[:tinycore].get(:change_host_name)
+  end
+  let(:machine) { double("machine") }
+  let(:communicator) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
+  let(:old_hostname) { 'boot2docker' }
+
+  before do
+    allow(machine).to receive(:communicate).and_return(communicator)
+    communicator.stub_command('hostname -f', stdout: old_hostname)
+  end
+
+  after do
+    communicator.verify_expectations!
+  end
+
+  describe ".change_host_name" do
+    it "refreshes the hostname service with the sethostname command" do
+      communicator.expect_command(%q(/usr/bin/sethostname newhostname.newdomain.tld))
+      described_class.change_host_name(machine, 'newhostname.newdomain.tld')
+    end
+  end
+end

From cdd57b0be70d64af0061055eb72caa3288673118 Mon Sep 17 00:00:00 2001
From: Brooks Brown <brooks@bureaublank.com>
Date: Wed, 22 Apr 2015 17:06:08 -0400
Subject: [PATCH 069/165] Added a note on PowerShell to prerequisites SMB
 documentation.

---
 website/docs/source/v2/synced-folders/smb.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/synced-folders/smb.html.md b/website/docs/source/v2/synced-folders/smb.html.md
index 130a7dabf..1b12fead0 100644
--- a/website/docs/source/v2/synced-folders/smb.html.md
+++ b/website/docs/source/v2/synced-folders/smb.html.md
@@ -25,7 +25,7 @@ alternative to some other mechanisms such as VirtualBox shared folders.
 ## Prerequisites
 
 To use the SMB synced folder type, the machine running Vagrant must be
-a Windows machine. In addition to this, the command prompt executing Vagrant
+a Windows machine with PowerShell version 3 or later installed. In addition to this, the command prompt executing Vagrant
 must have administrative privileges. Vagrant requires these privileges in
 order to create new network folder shares.
 

From a3fb92783eab57a74bba8605d21058fbd3fc9232 Mon Sep 17 00:00:00 2001
From: Brooks Brown <brooks@bureaublank.com>
Date: Thu, 23 Apr 2015 17:31:57 -0400
Subject: [PATCH 070/165] added gpg signature for rmv and bundle gem install to
 the documentation Vagrantfile

---
 website/docs/Vagrantfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/website/docs/Vagrantfile b/website/docs/Vagrantfile
index 7ce24fe70..29280239a 100644
--- a/website/docs/Vagrantfile
+++ b/website/docs/Vagrantfile
@@ -4,11 +4,13 @@
 $script = <<SCRIPT
 sudo apt-get -y update
 sudo apt-get -y install curl
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 curl -sSL https://get.rvm.io | bash -s stable
 . ~/.bashrc
 . ~/.bash_profile
 rvm install 2.0.0
 rvm --default use 2.0.0
+gem install bundle
 cd /vagrant
 bundle
 SCRIPT

From 4dd35802b63da28364f945f3a4a5ee0f6a93e412 Mon Sep 17 00:00:00 2001
From: jaisubramani <sjaikumar@gmail.com>
Date: Sat, 25 Apr 2015 17:22:10 -0700
Subject: [PATCH 071/165] Updated ssh docs

---
 website/docs/source/v2/cli/ssh.html.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/website/docs/source/v2/cli/ssh.html.md b/website/docs/source/v2/cli/ssh.html.md
index 68685cbac..f910b324b 100644
--- a/website/docs/source/v2/cli/ssh.html.md
+++ b/website/docs/source/v2/cli/ssh.html.md
@@ -17,8 +17,7 @@ any arbitrary commands to do things such as reverse tunneling down into the
 ## Options
 
 * `-c COMMAND` or `--command COMMAND` - This executes a single SSH command, prints
-  out the stdout and stderr, and exits. stdin will not be functional on this
-  executed command.
+  out the stdout and stderr, and exits.
 
 * `-p` or `--plain` - This does an SSH without authentication, leaving
   authentication up to the user.

From c7f32e615986fb54e08f47db39e8b17578728bed Mon Sep 17 00:00:00 2001
From: Paul Krohn <pkrohn@krux.com>
Date: Sun, 26 Apr 2015 11:34:34 -0700
Subject: [PATCH 072/165] When you can't find the salt minion or master config,
 say what you were looking for.

---
 plugins/provisioners/salt/config.rb | 4 ++--
 templates/locales/en.yml            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 4d97d942c..0aabddf4f 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -95,14 +95,14 @@ module VagrantPlugins
         if @minion_config
           expanded = Pathname.new(@minion_config).expand_path(machine.env.root_path)
           if !expanded.file?
-            errors << I18n.t("vagrant.provisioners.salt.minion_config_nonexist")
+            errors << I18n.t("vagrant.provisioners.salt.minion_config_nonexist", missing_config_file: expanded)
           end
         end
 
         if @master_config
           expanded = Pathname.new(@master_config).expand_path(machine.env.root_path)
           if !expanded.file?
-            errors << I18n.t("vagrant.provisioners.salt.master_config_nonexist")
+            errors << I18n.t("vagrant.provisioners.salt.master_config_nonexist",  missing_config_file: expanded)
           end
         end
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f5de5b2c0..92edd0d0a 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1908,9 +1908,9 @@ en:
 
       salt:
         minion_config_nonexist: |-
-          The specified minion_config file could not be found.
+          The specified minion_config '%{missing_config_file}' file could not be found.
         master_config_nonexist: |-
-          The specified master_config file could not be found.
+          The specified master_config '%{missing_config_file}' file could not be found.
         grains_config_nonexist: |-
           The specified grains_config file could not be found.
         missing_key: |-

From 25639ab6c2456d66b5fbc5d422d22cd6255e60ea Mon Sep 17 00:00:00 2001
From: Dave Mangot <dmangot@librato.com>
Date: Sun, 26 Apr 2015 12:25:36 -0700
Subject: [PATCH 073/165] fix master_config documentation

---
 website/docs/source/v2/provisioning/salt.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/salt.html.md b/website/docs/source/v2/provisioning/salt.html.md
index 4e832fb8e..e123c1577 100644
--- a/website/docs/source/v2/provisioning/salt.html.md
+++ b/website/docs/source/v2/provisioning/salt.html.md
@@ -85,7 +85,7 @@ public key
 ## Master Options
 These only make sense when `install_master` is `true`.
 
-* `master_config` (string, default: "salt/minion")
+* `master_config` (string, default: "salt/master")
   Path to a custom salt master config file
 
 * `master_key` (salt/key/master.pem) - Path to your master key

From 9bbfbef9776cd107cb1c17893985059f8e570ef2 Mon Sep 17 00:00:00 2001
From: Ben Hines <bhines@gmail.com>
Date: Mon, 27 Apr 2015 23:09:07 -0700
Subject: [PATCH 074/165] Be a bit more robust when parsing environment.conf

---
 plugins/provisioners/puppet/provisioner/puppet.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index e2c7b17e1..00cc1554c 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -57,14 +57,17 @@ module VagrantPlugins
         end
 
         def parse_environment_metadata
+          # Parse out the environment manifest path since puppet apply doesnt do that for us.
           environment_conf = File.join(environments_guest_path, @config.environment, "environment.conf")
           if @machine.communicate.test("test -e #{environment_conf}", sudo: true)
             conf = @machine.communicate.sudo("cat #{environment_conf}") do | type, data|
               if type == :stdout
-                # Parse out the environment manifest path since puppet apply doesnt do that for us.
-                if data =~ /\s+manifest\s+=\s(.*)/
-                  @manifest_file = $1
-                  @manifest_file.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
+                data.each_line do |line|
+                  if line =~ /^\s*manifest\s+=\s+([^\s]+)/
+                    @manifest_file = $1
+                    @manifest_file.gsub! '$basemodulepath:', "#{environments_guest_path}/#{@config.environment}/"
+                    @logger.debug("Using manifest from environment.conf: #{@manifest_file}")
+                  end
                 end
               end
             end

From 4d3e0cac6261e4bbb57879de160c1e85afacad37 Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Tue, 28 Apr 2015 17:53:48 +0200
Subject: [PATCH 075/165] Support Virtualbox 5.0 (beta) by adding a driver,
 referencing it in the list of acceptable versions/drivers, and autoloading
 the file in the virtualbox plugin file.

---
 plugins/providers/virtualbox/driver/meta.rb   |   3 +-
 .../virtualbox/driver/version_5_0.rb          | 615 ++++++++++++++++++
 plugins/providers/virtualbox/plugin.rb        |   1 +
 3 files changed, 618 insertions(+), 1 deletion(-)
 create mode 100644 plugins/providers/virtualbox/driver/version_5_0.rb

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 8fb8867f1..8d83ff47f 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -49,7 +49,8 @@ module VagrantPlugins
             "4.0" => Version_4_0,
             "4.1" => Version_4_1,
             "4.2" => Version_4_2,
-            "4.3" => Version_4_3
+            "4.3" => Version_4_3,
+            "5.0" => Version_5_0
           }
 
           if @version.start_with?("4.2.14")
diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
new file mode 100644
index 000000000..b1e5dc6f4
--- /dev/null
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -0,0 +1,615 @@
+require 'log4r'
+
+require "vagrant/util/platform"
+
+require File.expand_path("../base", __FILE__)
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      # Driver for VirtualBox 5.0.x
+      class Version_5_0 < Base
+        def initialize(uuid)
+          super()
+
+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_5_0")
+          @uuid = uuid
+        end
+
+        def clear_forwarded_ports
+          args = []
+          read_forwarded_ports(@uuid).each do |nic, name, _, _|
+            args.concat(["--natpf#{nic}", "delete", name])
+          end
+
+          execute("modifyvm", @uuid, *args) if !args.empty?
+        end
+
+        def clear_shared_folders
+          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
+              execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
+            end
+          end
+        end
+
+        def create_dhcp_server(network, options)
+          execute("dhcpserver", "add", "--ifname", network,
+                  "--ip", options[:dhcp_ip],
+                  "--netmask", options[:netmask],
+                  "--lowerip", options[:dhcp_lower],
+                  "--upperip", options[:dhcp_upper],
+                  "--enable")
+        end
+
+        def create_host_only_network(options)
+          # Create the interface
+          execute("hostonlyif", "create") =~ /^Interface '(.+?)' was successfully created$/
+            name = $1.to_s
+
+          # Configure it
+          execute("hostonlyif", "ipconfig", name,
+                  "--ip", options[:adapter_ip],
+                  "--netmask", options[:netmask])
+
+          # Return the details
+          return {
+            name: name,
+            ip:   options[:adapter_ip],
+            netmask: options[:netmask],
+            dhcp: nil
+          }
+        end
+
+        def delete
+          execute("unregistervm", @uuid, "--delete")
+        end
+
+        def delete_unused_host_only_networks
+          networks = []
+          execute("list", "hostonlyifs", retryable: true).split("\n").each do |line|
+            networks << $1.to_s if line =~ /^Name:\s+(.+?)$/
+          end
+
+          execute("list", "vms", retryable: true).split("\n").each do |line|
+            if line =~ /^".+?"\s+\{(.+?)\}$/
+              info = execute("showvminfo", $1.to_s, "--machinereadable", retryable: true)
+              info.split("\n").each do |inner_line|
+                if inner_line =~ /^hostonlyadapter\d+="(.+?)"$/
+                  networks.delete($1.to_s)
+                end
+              end
+            end
+          end
+
+          networks.each do |name|
+            # First try to remove any DHCP servers attached. We use `raw` because
+            # it is okay if this fails. It usually means that a DHCP server was
+            # never attached.
+            raw("dhcpserver", "remove", "--ifname", name)
+
+            # Delete the actual host only network interface.
+            execute("hostonlyif", "remove", name)
+          end
+        end
+
+        def discard_saved_state
+          execute("discardstate", @uuid)
+        end
+
+        def enable_adapters(adapters)
+          args = []
+          adapters.each do |adapter|
+            args.concat(["--nic#{adapter[:adapter]}", adapter[:type].to_s])
+
+            if adapter[:bridge]
+              args.concat(["--bridgeadapter#{adapter[:adapter]}",
+                          adapter[:bridge], "--cableconnected#{adapter[:adapter]}", "on"])
+            end
+
+            if adapter[:hostonly]
+              args.concat(["--hostonlyadapter#{adapter[:adapter]}",
+                          adapter[:hostonly], "--cableconnected#{adapter[:adapter]}", "on"])
+            end
+
+            if adapter[:intnet]
+              args.concat(["--intnet#{adapter[:adapter]}",
+                          adapter[:intnet], "--cableconnected#{adapter[:adapter]}", "on"])
+            end
+
+            if adapter[:mac_address]
+              args.concat(["--macaddress#{adapter[:adapter]}",
+                          adapter[:mac_address]])
+            end
+
+            if adapter[:nic_type]
+              args.concat(["--nictype#{adapter[:adapter]}", adapter[:nic_type].to_s])
+            end
+          end
+
+          execute("modifyvm", @uuid, *args)
+        end
+
+        def execute_command(command)
+          execute(*command)
+        end
+
+        def export(path)
+          execute("export", @uuid, "--output", path.to_s)
+        end
+
+        def forward_ports(ports)
+          args = []
+          ports.each do |options|
+            pf_builder = [options[:name],
+              options[:protocol] || "tcp",
+              options[:hostip] || "",
+              options[:hostport],
+              options[:guestip] || "",
+              options[:guestport]]
+
+            args.concat(["--natpf#{options[:adapter] || 1}",
+                        pf_builder.join(",")])
+          end
+
+          execute("modifyvm", @uuid, *args) if !args.empty?
+        end
+
+        def halt
+          execute("controlvm", @uuid, "poweroff")
+        end
+
+        def import(ovf)
+          ovf = Vagrant::Util::Platform.cygwin_windows_path(ovf)
+
+          output = ""
+          total = ""
+          last  = 0
+
+          # Dry-run the import to get the suggested name and path
+          @logger.debug("Doing dry-run import to determine parallel-safe name...")
+          output = execute("import", "-n", ovf)
+          result = /Suggested VM name "(.+?)"/.match(output)
+          if !result
+            raise Vagrant::Errors::VirtualBoxNoName, output: output
+          end
+          suggested_name = result[1].to_s
+
+          # Append millisecond plus a random to the path in case we're
+          # importing the same box elsewhere.
+          specified_name = "#{suggested_name}_#{(Time.now.to_f * 1000.0).to_i}_#{rand(100000)}"
+          @logger.debug("-- Parallel safe name: #{specified_name}")
+
+          # Build the specified name param list
+          name_params = [
+            "--vsys", "0",
+            "--vmname", specified_name,
+          ]
+
+          # Extract the disks list and build the disk target params
+          disk_params = []
+          disks = output.scan(/(\d+): Hard disk image: source image=.+, target path=(.+),/)
+          disks.each do |unit_num, path|
+            disk_params << "--vsys"
+            disk_params << "0"
+            disk_params << "--unit"
+            disk_params << unit_num
+            disk_params << "--disk"
+            if Vagrant::Util::Platform.windows?
+              # we use the block form of sub here to ensure that if the specified_name happens to end with a number (which is fairly likely) then
+              # we won't end up having the character sequence of a \ followed by a number be interpreted as a back reference.  For example, if
+              # specified_name were "abc123", then "\\abc123\\".reverse would be "\\321cba\\", and the \3 would be treated as a back reference by the sub
+              disk_params << path.reverse.sub("\\#{suggested_name}\\".reverse) { "\\#{specified_name}\\".reverse }.reverse # Replace only last occurrence
+            else
+              disk_params << path.reverse.sub("/#{suggested_name}/".reverse, "/#{specified_name}/".reverse).reverse # Replace only last occurrence
+            end
+          end
+
+          execute("import", ovf , *name_params, *disk_params) do |type, data|
+            if type == :stdout
+              # Keep track of the stdout so that we can get the VM name
+              output << data
+            elsif type == :stderr
+              # Append the data so we can see the full view
+              total << data.gsub("\r", "")
+
+              # Break up the lines. We can't get the progress until we see an "OK"
+              lines = total.split("\n")
+              if lines.include?("OK.")
+                # The progress of the import will be in the last line. Do a greedy
+                # regular expression to find what we're looking for.
+                match = /.+(\d{2})%/.match(lines.last)
+                if match
+                  current = match[1].to_i
+                  if current > last
+                    last = current
+                    yield current if block_given?
+                  end
+                end
+              end
+            end
+          end
+
+          output = execute("list", "vms", retryable: true)
+          match = /^"#{Regexp.escape(specified_name)}" \{(.+?)\}$/.match(output)
+          return match[1].to_s if match
+          nil
+        end
+
+        def max_network_adapters
+          36
+        end
+
+        def read_forwarded_ports(uuid=nil, active_only=false)
+          uuid ||= @uuid
+
+          @logger.debug("read_forward_ports: uuid=#{uuid} active_only=#{active_only}")
+
+          results = []
+          current_nic = nil
+          info = execute("showvminfo", uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            # This is how we find the nic that a FP is attached to,
+            # since this comes first.
+            current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
+
+              # If we care about active VMs only, then we check the state
+              # to verify the VM is running.
+              if active_only && line =~ /^VMState="(.+?)"$/ && $1.to_s != "running"
+                return []
+              end
+
+            # Parse out the forwarded port information
+            if line =~ /^Forwarding.+?="(.+?),.+?,.*?,(.+?),.*?,(.+?)"$/
+              result = [current_nic, $1.to_s, $2.to_i, $3.to_i]
+              @logger.debug("  - #{result.inspect}")
+              results << result
+            end
+          end
+
+          results
+        end
+
+        def read_bridged_interfaces
+          execute("list", "bridgedifs").split("\n\n").collect do |block|
+            info = {}
+
+            block.split("\n").each do |line|
+              if line =~ /^Name:\s+(.+?)$/
+                info[:name] = $1.to_s
+              elsif line =~ /^IPAddress:\s+(.+?)$/
+                info[:ip] = $1.to_s
+              elsif line =~ /^NetworkMask:\s+(.+?)$/
+                info[:netmask] = $1.to_s
+              elsif line =~ /^Status:\s+(.+?)$/
+                info[:status] = $1.to_s
+              end
+            end
+
+            # Return the info to build up the results
+            info
+          end
+        end
+
+        def read_dhcp_servers
+          execute("list", "dhcpservers", retryable: true).split("\n\n").collect do |block|
+            info = {}
+
+            block.split("\n").each do |line|
+              if network = line[/^NetworkName:\s+HostInterfaceNetworking-(.+?)$/, 1]
+                info[:network]      = network
+                info[:network_name] = "HostInterfaceNetworking-#{network}"
+              elsif ip = line[/^IP:\s+(.+?)$/, 1]
+                info[:ip] = ip
+              elsif netmask = line[/^NetworkMask:\s+(.+?)$/, 1]
+                info[:netmask] = netmask
+              elsif lower = line[/^lowerIPAddress:\s+(.+?)$/, 1]
+                info[:lower] = lower
+              elsif upper = line[/^upperIPAddress:\s+(.+?)$/, 1]
+                info[:upper] = upper
+              end
+            end
+
+            info
+          end
+        end
+
+        def read_guest_additions_version
+          output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version",
+                           retryable: true)
+          if output =~ /^Value: (.+?)$/
+            # Split the version by _ since some distro versions modify it
+            # to look like this: 4.1.2_ubuntu, and the distro part isn't
+            # too important.
+            value = $1.to_s
+            return value.split("_").first
+          end
+
+          # If we can't get the guest additions version by guest property, try
+          # to get it from the VM info itself.
+          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            return $1.to_s if line =~ /^GuestAdditionsVersion="(.+?)"$/
+          end
+
+          return nil
+        end
+
+        def read_guest_ip(adapter_number)
+          ip = read_guest_property("/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP")
+          if !valid_ip_address?(ip)
+            raise Vagrant::Errors::VirtualBoxGuestPropertyNotFound,
+              guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
+          end
+
+          return ip
+        end
+
+        def read_guest_property(property)
+          output = execute("guestproperty", "get", @uuid, property)
+          if output =~ /^Value: (.+?)$/
+            $1.to_s
+          else
+            raise Vagrant::Errors::VirtualBoxGuestPropertyNotFound, guest_property: property
+          end
+        end
+
+        def read_host_only_interfaces
+          execute("list", "hostonlyifs", retryable: true).split("\n\n").collect do |block|
+            info = {}
+
+            block.split("\n").each do |line|
+              if line =~ /^Name:\s+(.+?)$/
+                info[:name] = $1.to_s
+              elsif line =~ /^IPAddress:\s+(.+?)$/
+                info[:ip] = $1.to_s
+              elsif line =~ /^NetworkMask:\s+(.+?)$/
+                info[:netmask] = $1.to_s
+              elsif line =~ /^Status:\s+(.+?)$/
+                info[:status] = $1.to_s
+              end
+            end
+
+            info
+          end
+        end
+
+        def read_mac_address
+          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            return $1.to_s if line =~ /^macaddress1="(.+?)"$/
+          end
+
+          nil
+        end
+
+        def read_mac_addresses
+          macs = {}
+          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            if matcher = /^macaddress(\d+)="(.+?)"$/.match(line)
+              adapter = matcher[1].to_i
+              mac = matcher[2].to_s
+              macs[adapter] = mac
+            end
+          end
+          macs
+        end
+
+        def read_machine_folder
+          execute("list", "systemproperties", retryable: true).split("\n").each do |line|
+            if line =~ /^Default machine folder:\s+(.+?)$/i
+              return $1.to_s
+            end
+          end
+
+          nil
+        end
+
+        def read_network_interfaces
+          nics = {}
+          info = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          info.split("\n").each do |line|
+            if line =~ /^nic(\d+)="(.+?)"$/
+              adapter = $1.to_i
+              type    = $2.to_sym
+
+              nics[adapter] ||= {}
+              nics[adapter][:type] = type
+            elsif line =~ /^hostonlyadapter(\d+)="(.+?)"$/
+              adapter = $1.to_i
+              network = $2.to_s
+
+              nics[adapter] ||= {}
+              nics[adapter][:hostonly] = network
+            elsif line =~ /^bridgeadapter(\d+)="(.+?)"$/
+              adapter = $1.to_i
+              network = $2.to_s
+
+              nics[adapter] ||= {}
+              nics[adapter][:bridge] = network
+            end
+          end
+
+          nics
+        end
+
+        def read_state
+          output = execute("showvminfo", @uuid, "--machinereadable", retryable: true)
+          if output =~ /^name="<inaccessible>"$/
+            return :inaccessible
+          elsif output =~ /^VMState="(.+?)"$/
+            return $1.to_sym
+          end
+
+          nil
+        end
+
+        def read_used_ports
+          ports = []
+          execute("list", "vms", retryable: true).split("\n").each do |line|
+            if line =~ /^".+?" \{(.+?)\}$/
+              uuid = $1.to_s
+
+              # Ignore our own used ports
+              next if uuid == @uuid
+
+              read_forwarded_ports(uuid, true).each do |_, _, hostport, _|
+                ports << hostport
+              end
+            end
+          end
+
+          ports
+        end
+
+        def read_vms
+          results = {}
+          execute("list", "vms", retryable: true).split("\n").each do |line|
+            if line =~ /^"(.+?)" \{(.+?)\}$/
+              results[$1.to_s] = $2.to_s
+            end
+          end
+
+          results
+        end
+
+        def remove_dhcp_server(network_name)
+          execute("dhcpserver", "remove", "--netname", network_name)
+        end
+
+        def set_mac_address(mac)
+          execute("modifyvm", @uuid, "--macaddress1", mac)
+        end
+
+        def set_name(name)
+          execute("modifyvm", @uuid, "--name", name, retryable: true)
+        rescue Vagrant::Errors::VBoxManageError => e
+          raise if !e.extra_data[:stderr].include?("VERR_ALREADY_EXISTS")
+
+          # We got VERR_ALREADY_EXISTS. This means that we're renaming to
+          # a VM name that already exists. Raise a custom error.
+          raise Vagrant::Errors::VirtualBoxNameExists,
+            stderr: e.extra_data[:stderr]
+        end
+
+        def share_folders(folders)
+          folders.each do |folder|
+            args = ["--name",
+              folder[:name],
+              "--hostpath",
+              folder[:hostpath]]
+            args << "--transient" if folder.key?(:transient) && folder[:transient]
+
+            # Enable symlinks on the shared folder
+            execute("setextradata", @uuid, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{folder[:name]}", "1")
+
+            # Add the shared folder
+            execute("sharedfolder", "add", @uuid, *args)
+          end
+        end
+
+        def ssh_port(expected_port)
+          @logger.debug("Searching for SSH port: #{expected_port.inspect}")
+
+          # Look for the forwarded port only by comparing the guest port
+          read_forwarded_ports.each do |_, _, hostport, guestport|
+            return hostport if guestport == expected_port
+          end
+
+          nil
+        end
+
+        def resume
+          @logger.debug("Resuming paused VM...")
+          execute("controlvm", @uuid, "resume")
+        end
+
+        def start(mode)
+          command = ["startvm", @uuid, "--type", mode.to_s]
+          r = raw(*command)
+
+          if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+            # Some systems return an exit code 1 for some reason. For that
+            # we depend on the output.
+            return true
+          end
+
+          # If we reached this point then it didn't work out.
+          raise Vagrant::Errors::VBoxManageError,
+            command: command.inspect,
+            stderr: r.stderr
+        end
+
+        def suspend
+          execute("controlvm", @uuid, "savestate")
+        end
+
+        def unshare_folders(names)
+          names.each do |name|
+            begin
+              execute(
+                "sharedfolder", "remove", @uuid,
+                "--name", name,
+                "--transient")
+
+              execute(
+                "setextradata", @uuid,
+                "VBoxInternal2/SharedFoldersEnableSymlinksCreate/#{name}")
+            rescue Vagrant::Errors::VBoxManageError => e
+              if e.extra_data[:stderr].include?("VBOX_E_FILE_ERROR")
+                # The folder doesn't exist. ignore.
+              else
+                raise
+              end
+            end
+          end
+        end
+
+        def verify!
+          # This command sometimes fails if kernel drivers aren't properly loaded
+          # so we just run the command and verify that it succeeded.
+          execute("list", "hostonlyifs", retryable: true)
+        end
+
+        def verify_image(path)
+          r = raw("import", path.to_s, "--dry-run")
+          return r.exit_code == 0
+        end
+
+        def vm_exists?(uuid)
+          5.times do |i|
+            result = raw("showvminfo", uuid)
+            return true if result.exit_code == 0
+
+            # GH-2479: Sometimes this happens. In this case, retry. If
+            # we don't see this text, the VM really probably doesn't exist.
+            return false if !result.stderr.include?("CO_E_SERVER_EXEC_FAILURE")
+
+            # Sleep a bit though to give VirtualBox time to fix itself
+            sleep 2
+          end
+
+          # If we reach this point, it means that we consistently got the
+          # failure, do a standard vboxmanage now. This will raise an
+          # exception if it fails again.
+          execute("showvminfo", uuid)
+          return true
+        end
+
+        protected
+
+        def valid_ip_address?(ip)
+          # Filter out invalid IP addresses
+          # GH-4658 VirtualBox can report an IP address of 0.0.0.0 for FreeBSD guests.
+          if ip == "0.0.0.0"
+            return false
+          else
+            return true
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
index 7fc0ea039..18e33d4bb 100644
--- a/plugins/providers/virtualbox/plugin.rb
+++ b/plugins/providers/virtualbox/plugin.rb
@@ -45,6 +45,7 @@ module VagrantPlugins
       autoload :Version_4_1, File.expand_path("../driver/version_4_1", __FILE__)
       autoload :Version_4_2, File.expand_path("../driver/version_4_2", __FILE__)
       autoload :Version_4_3, File.expand_path("../driver/version_4_3", __FILE__)
+      autoload :Version_5_0, File.expand_path("../driver/version_5_0", __FILE__)
     end
 
     module Model

From 29c77e571973e332a69a48f81960ffe2ce34eeb5 Mon Sep 17 00:00:00 2001
From: Matthew Rahtz <mr13@sanger.ac.uk>
Date: Wed, 29 Apr 2015 14:32:24 +0100
Subject: [PATCH 076/165] Escape/unescape cURL URLs/auth

so that we can deal with special characters in usernames and passwords
---
 lib/vagrant/util/downloader.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb
index dd3abaa72..5e52eb674 100644
--- a/lib/vagrant/util/downloader.rb
+++ b/lib/vagrant/util/downloader.rb
@@ -27,10 +27,10 @@ module Vagrant
         @destination = destination.to_s
 
         begin
-          url = URI.parse(@source)
+          url = URI.parse(URI.escape(@source))
           if url.scheme && url.scheme.start_with?("http") && url.user
-            auth = "#{url.user}"
-            auth += ":#{url.password}" if url.password
+            auth = "#{URI.unescape(url.user)}"
+            auth += ":#{URI.unescape(url.password)}" if url.password
             url.user = nil
             url.password = nil
             options[:auth] ||= auth

From 079e06cd093809c27ea5e42fcfd85b8b4cf86e7c Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Thu, 30 Apr 2015 16:07:48 +0300
Subject: [PATCH 077/165] box/package: Take only files while packaging the new
 box

Fixes GH-5657
---
 lib/vagrant/box.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vagrant/box.rb b/lib/vagrant/box.rb
index 537c94e2a..ce829870a 100644
--- a/lib/vagrant/box.rb
+++ b/lib/vagrant/box.rb
@@ -173,7 +173,7 @@ module Vagrant
 
       Util::SafeChdir.safe_chdir(@directory) do
         # Find all the files in our current directory and tar it up!
-        files = Dir.glob(File.join(".", "**", "*"))
+        files = Dir.glob(File.join(".", "**", "*")).select { |f| File.file?(f) }
 
         # Package!
         Util::Subprocess.execute("bsdtar", "-czf", path.to_s, *files)

From 9233e229742f47393fc49a2d5d570d7a33bb2ff0 Mon Sep 17 00:00:00 2001
From: Taliesin Sisson <taliesins@yahoo.com>
Date: Sat, 2 May 2015 15:47:11 +0100
Subject: [PATCH 078/165] Use powershell syntax for Chef provisioner when using
 windows

---
 .../chef/cap/windows/chef_installed.rb        | 20 ++++++++++
 plugins/provisioners/chef/plugin.rb           |  5 +++
 plugins/provisioners/chef/provisioner/base.rb | 40 ++++++++++++++++---
 .../chef/provisioner/chef_apply.rb            |  8 +++-
 .../chef/provisioner/chef_client.rb           |  6 ++-
 5 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 plugins/provisioners/chef/cap/windows/chef_installed.rb

diff --git a/plugins/provisioners/chef/cap/windows/chef_installed.rb b/plugins/provisioners/chef/cap/windows/chef_installed.rb
new file mode 100644
index 000000000..c95ea8498
--- /dev/null
+++ b/plugins/provisioners/chef/cap/windows/chef_installed.rb
@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module Chef
+    module Cap
+      module Windows
+        module ChefInstalled
+          # Check if Chef is installed at the given version.
+          # @return [true, false]
+          def self.chef_installed(machine, version)
+            if version != :latest
+              command = 'if ((&knife --version) -Match "Chef: "' + version + '"){ exit 0 } else { exit 1 }'
+            else
+              command = 'if ((&knife --version) -Match "Chef: *"){ exit 0 } else { exit 1 }'
+            end
+            machine.communicate.test(command, sudo: true)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/provisioners/chef/plugin.rb b/plugins/provisioners/chef/plugin.rb
index 5a1b2876f..540429fad 100644
--- a/plugins/provisioners/chef/plugin.rb
+++ b/plugins/provisioners/chef/plugin.rb
@@ -58,6 +58,11 @@ module VagrantPlugins
         Cap::Linux::ChefInstalled
       end
 
+      guest_capability(:windows, :chef_installed) do
+        require_relative "cap/windows/chef_installed"
+        Cap::Windows::ChefInstalled
+      end
+
       guest_capability(:debian, :chef_install) do
         require_relative "cap/debian/chef_install"
         Cap::Debian::ChefInstall
diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb
index a5efb5be4..aed44eaf0 100644
--- a/plugins/provisioners/chef/provisioner/base.rb
+++ b/plugins/provisioners/chef/provisioner/base.rb
@@ -37,8 +37,14 @@ module VagrantPlugins
         def verify_binary(binary)
           # Checks for the existence of chef binary and error if it
           # doesn't exist.
+          if windows?
+            command = "if ((&'#{binary}' -v) -Match 'Chef: *'){ exit 0 } else { exit 1 }"
+          else
+            command = "sh -c 'command -v #{binary}'"
+          end
+
           @machine.communicate.sudo(
-            "sh -c 'command -v #{binary}'",
+            command,
             error_class: ChefError,
             error_key: :chef_not_detected,
             binary: binary,
@@ -66,8 +72,12 @@ module VagrantPlugins
 
           @machine.communicate.tap do |comm|
             paths.each do |path|
-              comm.sudo("mkdir -p #{path}")
-              comm.sudo("chown -h #{@machine.ssh_info[:username]} #{path}")
+              if windows?
+                comm.sudo("mkdir ""#{path}"" -f")
+              else
+                comm.sudo("mkdir -p #{path}")
+                comm.sudo("chown -h #{@machine.ssh_info[:username]} #{path}")
+              end
             end
           end
         end
@@ -133,7 +143,13 @@ module VagrantPlugins
 
           remote_file = File.join(@config.provisioning_path, "dna.json")
           @machine.communicate.tap do |comm|
-            comm.sudo("rm -f #{remote_file}", error_check: false)
+            if windows?
+              command = "if (test-path '#{remote_file}') {rm '#{remote_file}' -force -recurse}"
+            else
+              command = "rm -f #{remote_file}"
+            end
+
+            comm.sudo(command, error_check: false)
             comm.upload(temp.path, remote_file)
           end
         end
@@ -146,7 +162,13 @@ module VagrantPlugins
             "vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
 
           @machine.communicate.tap do |comm|
-            comm.sudo("rm -f #{remote_file}", error_check: false)
+            if windows?
+              command = "if (test-path ""#{remote_file}"") {rm ""#{remote_file}"" -force -recurse}"
+            else
+              command = "rm -f #{remote_file}"
+            end
+
+            comm.sudo(command, error_check: false)
             comm.upload(encrypted_data_bag_secret_key_path, remote_file)
           end
         end
@@ -154,7 +176,13 @@ module VagrantPlugins
         def delete_encrypted_data_bag_secret
           remote_file = guest_encrypted_data_bag_secret_key_path
           if remote_file
-            @machine.communicate.sudo("rm -f #{remote_file}", error_check: false)
+            if windows?
+              command = "if (test-path ""#{remote_file}"") {rm ""#{remote_file}"" -force -recurse}"
+            else
+              command = "rm -f #{remote_file}"
+            end
+
+            @machine.communicate.sudo(command, error_check: false)
           end
         end
 
diff --git a/plugins/provisioners/chef/provisioner/chef_apply.rb b/plugins/provisioners/chef/provisioner/chef_apply.rb
index 1ff4790b6..602c81f3d 100644
--- a/plugins/provisioners/chef/provisioner/chef_apply.rb
+++ b/plugins/provisioners/chef/provisioner/chef_apply.rb
@@ -18,8 +18,12 @@ module VagrantPlugins
           user = @machine.ssh_info[:username]
 
           # Reset upload path permissions for the current ssh user
-          @machine.communicate.sudo("mkdir -p #{config.upload_path}")
-          @machine.communicate.sudo("chown -R #{user} #{config.upload_path}")
+          if windows?
+            @machine.communicate.sudo("mkdir ""#{config.upload_path}"" -f")
+          else
+            @machine.communicate.sudo("mkdir -p #{config.upload_path}")
+            @machine.communicate.sudo("chown -R #{user} #{config.upload_path}")
+          end
 
           # Upload the recipe
           upload_recipe
diff --git a/plugins/provisioners/chef/provisioner/chef_client.rb b/plugins/provisioners/chef/provisioner/chef_client.rb
index c9b0ab6c0..f0209d2a0 100644
--- a/plugins/provisioners/chef/provisioner/chef_client.rb
+++ b/plugins/provisioners/chef/provisioner/chef_client.rb
@@ -39,7 +39,11 @@ module VagrantPlugins
           @machine.ui.info I18n.t("vagrant.provisioners.chef.client_key_folder")
           path = Pathname.new(@config.client_key_path)
 
-          @machine.communicate.sudo("mkdir -p #{path.dirname}")
+          if windows?
+            @machine.communicate.sudo("mkdir ""#{path.dirname}"" -f")
+          else
+            @machine.communicate.sudo("mkdir -p #{path.dirname}")
+          end
         end
 
         def upload_validation_key

From 37eb006c0bdf3a9c4e90923d1afb39ee89faf9f0 Mon Sep 17 00:00:00 2001
From: c33s <dev@c33s.net>
Date: Wed, 6 May 2015 00:12:42 +0200
Subject: [PATCH 079/165] added favicon for www & doc

---
 website/docs/source/favicon.ico        | Bin 0 -> 1150 bytes
 website/docs/source/layouts/layout.erb |   3 +++
 website/www/source/favicon.ico         | Bin 0 -> 1150 bytes
 website/www/source/layouts/layout.erb  |   3 +++
 4 files changed, 6 insertions(+)
 create mode 100644 website/docs/source/favicon.ico
 create mode 100644 website/www/source/favicon.ico

diff --git a/website/docs/source/favicon.ico b/website/docs/source/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2b5cd33d677c1f31c415f5cff8953192fbdb4f9c
GIT binary patch
literal 1150
zcmaJ=SxggA6rEZUKKy{hgy@eFKZw7^#P~zhkobv+ASxmP1&SaIEhq>`kthM#X+a_E
z`>rS&<5oq$CL%6~tXj38C|Wv0rz6l_@0Co_RKja+-*V46cX@9ZMuI<gcLx7G8MzC?
zcrXmJ3k{F(WbGU$<^cM(Y+f_kZ!|iiF1mC@r{;brZpuNEZiIFA-8_5g81g^%#;M_P
zavnTQEu0=JY7B73t+(%qN%!xTrvb(WT(f<OES5ATN?YJvex2`n9LF<^J&XpmC*z^<
zw9<qe(`Z3Gkl|YIh;?4yiNEZHc|%>W0`4VT;b3}J0FJkOy3xhHyjnqg(%I?E6Zgo~
zV9wAImbCo7uz`a~qhRUjx1yGLB&TW>djNP|AmSZotk<P2;sS?Qim^hm2Gtt2`gj~$
z6%-5lta5(3tet#j^hq4Kw8owVBOkC|Fr{sSNlh!fxmE+WVl$vAR0R)`a`@rwO52l^
zd>Aij4qS(?Zw)_BJzx1=f7fQL?ghjT;T^u{h)jW+6X%vu+d7a@N_R2f$j8`TRCn{4
zM7nDW#<#!CtEGPJM&BON#kwhXo^qnvP-DBOf!vaISu!A2K#Z08gl~=${r6SbOE5SF
zLz!9ud-8{Bd!1XY#h&d$?k3ES)A)uHpG9puYLI@e$j5uhquyu_N7xawgt^#J^WPh}
z?jIFW85jeGif$fbERy!Kv?9{qD)K7=<lD;pWYim2>C>Cx;RsJ}tRW<!vp>Dq2+v0W
z>~<T_m^Xo`?a_aCJX79L0CNifHiTKM0I#NCw&u1D%u6Z|mO1$L3t+)K0j$MejO#oj
z?+ARJ9|z-40AAqWH<w5l-0y`iKhj}ljz0Yj2jV>7D`JsDz}5ZHjIhHyXwglkSab{Z
yHMshP8C<=6bW%U1PO1#kNe{)SC8|@IYDKt2eNZM*M|w(iibPj~Tv2HDIr<m-DdPtK

literal 0
HcmV?d00001

diff --git a/website/docs/source/layouts/layout.erb b/website/docs/source/layouts/layout.erb
index 310d7b0a8..75d7f13c2 100644
--- a/website/docs/source/layouts/layout.erb
+++ b/website/docs/source/layouts/layout.erb
@@ -8,6 +8,9 @@
 		<!-- meta -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
+		<!-- favicon -->    
+		<link rel="shortcut icon" href="favicon.ico">
+
 		<!-- lib styles -->
 		<%= stylesheet_link_tag "bootstrap", "vagrantup" %>
 
diff --git a/website/www/source/favicon.ico b/website/www/source/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71df20e61e27f3f8f0f649d1728e16e0ffaf47d4
GIT binary patch
literal 1150
zcmaJ=ZA?>F7`|P*V74ESnE4U;vXs`%m~0A0Oi+X|>Byic%pW=z7Y#01!UFz5B`FEZ
zv{nj5gUd9sxcP(V2BDM*h>fB4i;Ge}hQaY+6)vp^w-?&d+uq01m?lj%yeIE@zn<ru
zyzj}OC=ppnNfg=BspArgT0>FPCZZ%oGH>(5P<f=b`s246iB}S{RxY7+85-PDo<&!=
zcqMFn&Dy-_TT7#CeB^=x6Kz}ZqHX6h!BAQrk9%MIP@lHXp_9Q*)Tx(xpSCKz<89l3
zzG8&BlqK)u#O7=*a++@b6oU<ku%1~xkM8_=^yDLGC<bpRvc+QKedq5R<@WP3n14wE
z-I~QsxTXT^Vql5yKkOC$$suPHfj91z#`B`FO)I-F)RYOkW^HiEpyI$-15Wc_{`;+2
zY`Ak*NH7*7+*8yT#m8FGujJmjH15COwvc<i=Fwe%aQhaoqv1nuzd8|~_B<bMmmy?O
zvV3=;D3%-X9lFee=5uLy+`1X)SCM&@V!5*rBYHXR{JH_pE`RRx{+%Cwel;6Hud*VZ
zPdCYIgPK%~wxsa>yES2U;Aik1IhNsz3adpcg{|SE;QyC0{V%WQ0=G)cv3!Sqqnsvv
z-#wFpnQPfgd~b!|?IiOy7JM<>EZt_)BxCsIPjGb{^ue&3^spD`*`FFcW4KwSw`kKb
z)RYkj8kBzYC`rATi`E^Nauz3_nBcrt67aWgT}Gb@;f^maKF~>bIL~kXV5l*byIo7+
zdCMnW81n?a>l<L8P!r|T+6=8-n~eUGlrW)RyNJGB!qnx@&{w}6*3;teEcFsRGM@6W
zW1S1(-ZBW+6~Mn)>!N&X-KzD2rzqH)6d0%fWS5^@@lCaCz=&3I<G~+=FQy(1U<n9=
z$ed>Z+)(X1Z#>pp+303oV~${^7Xi;Gjga+_=@lESnOg?u@p!<_&p%~Y?2FzTZ(ngJ
zW2Rq@&d$z)@qu%{4xWf$+_TK~nVFe7m&+CT`YQ^-tzj6Z&h2KlM}VQ-l~f=t_rOBp
z(W-^S?@J~VR7WNgatlmiRkcZ6eZ(aG>PNMx=1{%5>Iac}&ry;3Si0C$bs}N%c$JPV
G*#8Es<k)Bc

literal 0
HcmV?d00001

diff --git a/website/www/source/layouts/layout.erb b/website/www/source/layouts/layout.erb
index 6f36e732f..80fb98860 100644
--- a/website/www/source/layouts/layout.erb
+++ b/website/www/source/layouts/layout.erb
@@ -6,6 +6,9 @@
 		<!-- meta -->
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
+		<!-- favicon -->
+		<link rel="shortcut icon" href="favicon.ico">
+
 		<!-- lib styles -->
 		<%= stylesheet_link_tag "bootstrap", "vagrantup" %>
 

From 1cf2a8db4ccbe853699ee363b3d1b010873b9c1a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Wed, 6 May 2015 14:07:27 -0700
Subject: [PATCH 080/165] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60e3a8e16..10f22d3b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@ BUG FIXES:
   - core: remove executable permissions on internal file [GH-5220]
   - core: check name and version in `has_plugin?` [GH-5218]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
+  - core/windows: allow Windows UNC paths to allow more than 256
+      characters [GH-4815]
   - communicators/winrm: improve error handling significantly and improve
       the error messages shown to be more human-friendly. [GH-4943]
   - hosts/nfs: allow colons (`:`) in NFS IDs [GH-5222]

From 2b3411965aef1095fded20ea14151ced577a2d91 Mon Sep 17 00:00:00 2001
From: Joakim Bergman <joab@kth.se>
Date: Thu, 7 May 2015 18:07:08 +0200
Subject: [PATCH 081/165] virtualbox: handle a list of bridged nics

This change allows you to specify multiple network interfaces to bridge
to, picking the first found.

```ruby
config.vm.network "public_network",
  bridge: ["en4: Thunderbolt Ethernet",
           "en6: Broadcom NetXtreme Gigabit Ethernet Controller",
           "en0: Wi-Fi (AirPort)"]
```
---
 plugins/providers/virtualbox/action/network.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index f1beff00b..df1146f35 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -157,14 +157,18 @@ module VagrantPlugins
             @logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}")
 
             # Search for a matching bridged interface
-            bridge = config[:bridge]
-            bridge = bridge.downcase if bridge.respond_to?(:downcase)
-            bridgedifs.each do |interface|
-              if bridge === interface[:name].downcase
-                @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
-                chosen_bridge = interface[:name]
-                break
+            bridges = config[:bridge]
+            bridges = [bridges] if not bridges.respond_to?(:each)
+            bridges.each do |bridge|
+              bridge = bridge.downcase if bridge.respond_to?(:downcase)
+              bridgedifs.each do |interface|
+                if bridge === interface[:name].downcase
+                  @logger.debug("Specific bridge found as configured in the Vagrantfile. Using it.")
+                  chosen_bridge = interface[:name]
+                  break
+                end
               end
+              break if chosen_bridge
             end
 
             # If one wasn't found, then we notify the user here.

From 7a94eba0b4d6de02e94832943e0fdee8d86066bd Mon Sep 17 00:00:00 2001
From: Benjamin Staneck <staneck@gmail.com>
Date: Sat, 9 May 2015 02:03:33 +0200
Subject: [PATCH 082/165] Port changes from pull request #5495 to the vb_5
 module to fix #4815 here, too.

---
 plugins/providers/virtualbox/driver/version_5_0.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/providers/virtualbox/driver/version_5_0.rb b/plugins/providers/virtualbox/driver/version_5_0.rb
index b1e5dc6f4..d7d3b58df 100644
--- a/plugins/providers/virtualbox/driver/version_5_0.rb
+++ b/plugins/providers/virtualbox/driver/version_5_0.rb
@@ -496,10 +496,14 @@ module VagrantPlugins
 
         def share_folders(folders)
           folders.each do |folder|
+            hostpath = folder[:hostpath]
+            if Vagrant::Util::Platform.windows?
+              hostpath = Vagrant::Util::Platform.windows_unc_path(hostpath)
+            end
             args = ["--name",
               folder[:name],
               "--hostpath",
-              folder[:hostpath]]
+              hostpath]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             # Enable symlinks on the shared folder

From 217a00c36c26df9517c27a3110dbf65ff79589cd Mon Sep 17 00:00:00 2001
From: Leo Cassarani <leo.cassarani@me.com>
Date: Mon, 11 May 2015 16:01:53 +0100
Subject: [PATCH 083/165] Add missing word to output of "vagrant up"

Add the word "flag" to the phrase "or use the `--provision` flag", which
is displayed when "vagrant up" is run for a VM that's already been
provisioned.
---
 templates/locales/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f5de5b2c0..930bde690 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1699,7 +1699,7 @@ en:
             Machine not provisioning because `--no-provision` is specified.
           disabled_by_sentinel: |-
             Machine already provisioned. Run `vagrant provision` or use the `--provision`
-            to force provisioning. Provisioners marked to run always will still run.
+            flag to force provisioning. Provisioners marked to run always will still run.
         resume:
           resuming: Resuming suspended VM...
           unpausing: |-

From c1c39beaabf29c32cd8ecaede6c9fd10cd9b1188 Mon Sep 17 00:00:00 2001
From: linyows <linyows@gmail.com>
Date: Wed, 13 May 2015 18:07:32 +0900
Subject: [PATCH 084/165] restart NetworkManager and network for CentOS 7.1

---
 plugins/guests/redhat/cap/configure_networks.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
index f176cca3d..81575b6ad 100644
--- a/plugins/guests/redhat/cap/configure_networks.rb
+++ b/plugins/guests/redhat/cap/configure_networks.rb
@@ -26,6 +26,9 @@ module VagrantPlugins
           require File.expand_path("../../../fedora/cap/configure_networks", __FILE__)
           ::VagrantPlugins::GuestFedora::Cap::ConfigureNetworks.
             configure_networks(machine, networks)
+
+          machine.communicate.sudo("systemctl restart NetworkManager")
+          machine.communicate.sudo("systemctl restart network")
         end
 
         def self.configure_networks_default(machine, networks)

From 1284c92e23f3688fc45ce19a84b50891c936ad1f Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Wed, 13 May 2015 19:49:41 +0200
Subject: [PATCH 085/165] Fix Vagrantfile to develop Vagrant

This fixes the following issues when using the provided Vagrantfile
that can be used to develop Vagrant.

* use -s for curl

* set a hostname

* set the config.ssh.shell in the development Vagrantfile

==> default: stdin: is not a tty

* export the DEBIAN_FRONTEND variable

==> default: dpkg-preconfigure: unable to re-open stdin: No such file or
directory

* import the mpapis public key to verify downloaded release

==> default: -su: rvm: command not found

* use official Ubuntu Trusty box

New release '14.04.2 LTS' available.
---
 Vagrantfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index e928b3c6b..c9b648219 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,7 +4,9 @@
 # Ruby, run unit tests, etc.
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "hashicorp/precise64"
+  config.vm.box = "ubuntu/trusty64"
+  config.vm.hostname = "vagrant"
+  config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
 
   ["vmware_fusion", "vmware_workstation", "virtualbox"].each do |provider|
     config.vm.provider provider do |v, override|
@@ -24,6 +26,7 @@ Vagrant.configure("2") do |config|
 end
 
 $shell = <<-CONTENTS
+export DEBIAN_FRONTEND=noninteractive
 MARKER_FILE="/usr/local/etc/vagrant_provision_marker"
 
 # Only provision once
@@ -37,8 +40,11 @@ apt-get update
 # Install basic dependencies
 apt-get install -y build-essential bsdtar curl
 
+# Import the mpapis public key to verify downloaded releases
+su -l -c 'curl -sSL https://rvm.io/mpapis.asc | gpg -q --import -' vagrant
+
 # Install RVM
-su -l -c 'curl -L https://get.rvm.io | bash -s stable' vagrant
+su -l -c 'curl -sL https://get.rvm.io | bash -s stable' vagrant
 
 # Add the vagrant user to the RVM group
 #usermod -a -G rvm vagrant

From 421fab17a2d7e7f9ef2f2bb1813ed46453b0ae13 Mon Sep 17 00:00:00 2001
From: linyows <linyows@gmail.com>
Date: Thu, 14 May 2015 12:53:23 +0900
Subject: [PATCH 086/165] reload connection instead of restart

---
 plugins/guests/fedora/cap/configure_networks.rb | 1 +
 plugins/guests/redhat/cap/configure_networks.rb | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/guests/fedora/cap/configure_networks.rb b/plugins/guests/fedora/cap/configure_networks.rb
index 2f67099cd..67669c58b 100644
--- a/plugins/guests/fedora/cap/configure_networks.rb
+++ b/plugins/guests/fedora/cap/configure_networks.rb
@@ -85,6 +85,7 @@ module VagrantPlugins
           interfaces.each do |interface|
             retryable(on: Vagrant::Errors::VagrantError, tries: 3, sleep: 2) do
               machine.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-#{interface}")
+              machine.communicate.sudo("which nmcli >/dev/null 2>&1 && nmcli c reload #{interface}")
               machine.communicate.sudo("/sbin/ifdown #{interface}", error_check: true)
               machine.communicate.sudo("/sbin/ifup #{interface}")
             end
diff --git a/plugins/guests/redhat/cap/configure_networks.rb b/plugins/guests/redhat/cap/configure_networks.rb
index 81575b6ad..f176cca3d 100644
--- a/plugins/guests/redhat/cap/configure_networks.rb
+++ b/plugins/guests/redhat/cap/configure_networks.rb
@@ -26,9 +26,6 @@ module VagrantPlugins
           require File.expand_path("../../../fedora/cap/configure_networks", __FILE__)
           ::VagrantPlugins::GuestFedora::Cap::ConfigureNetworks.
             configure_networks(machine, networks)
-
-          machine.communicate.sudo("systemctl restart NetworkManager")
-          machine.communicate.sudo("systemctl restart network")
         end
 
         def self.configure_networks_default(machine, networks)

From 16ac4e2321f373bf83d7b058c9f2e0c649ffe96e Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 9 May 2015 19:17:03 -0400
Subject: [PATCH 087/165] If plugins are disabled, report them as not
 available.

Allows usage of VAGRANT_NO_PLUGINS env var to disable plugins.

Fixes #5430.
---
 lib/vagrant.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index 1fb9c49d6..eba026c51 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -139,10 +139,12 @@ module Vagrant
     Config.run(version, &block)
   end
 
-  # This checks if a plugin with the given name is installed. This can
-  # be used from the Vagrantfile to easily branch based on plugin
-  # availability.
+  # This checks if a plugin with the given name is available (installed
+  # and enabled). This can be used from the Vagrantfile to easily branch
+  # based on plugin availability.
   def self.has_plugin?(name, version=nil)
+    return false unless Vagrant.plugins_enabled?
+
     if !version
       # We check the plugin names first because those are cheaper to check
       return true if plugin("2").manager.registered.any? { |p| p.name == name }

From b421af58e8b34411b1fe06d2976c0d2dc68dd704 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 15 May 2015 12:57:26 -0400
Subject: [PATCH 088/165] Do not test branches other than master

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6fb40430b..a810bf759 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,21 @@
 language: ruby
+
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq -y bsdtar
   - rvm @global do gem uninstall bundler --all --executables
   - gem uninstall bundler --all --executables
   - gem install bundler --version '< 1.7.0'
+
 rvm:
   - 2.0.0
+
+branches:
+  only:
+    - master
+
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
 script: rake test:unit

From b85248cb973fb12caac37ebf1af287c6dfdde6de Mon Sep 17 00:00:00 2001
From: Josef Stribny <jstribny@redhat.com>
Date: Tue, 19 May 2015 10:44:25 +0200
Subject: [PATCH 089/165] Recognize new Fedora releases

---
 plugins/guests/fedora/guest.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/fedora/guest.rb b/plugins/guests/fedora/guest.rb
index 64a5e3d86..c1b48d4ab 100644
--- a/plugins/guests/fedora/guest.rb
+++ b/plugins/guests/fedora/guest.rb
@@ -4,7 +4,7 @@ module VagrantPlugins
   module GuestFedora
     class Guest < Vagrant.plugin("2", :guest)
       def detect?(machine)
-        machine.communicate.test("grep 'Fedora release [12][678901]' /etc/redhat-release")
+        machine.communicate.test("grep 'Fedora release 1[6789]\\|Fedora release 2[0-9]' /etc/redhat-release")
       end
     end
   end

From ccc4162ee8ca16ce560b1efdc90cafa67cbc1415 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Tue, 12 May 2015 15:43:18 -0500
Subject: [PATCH 090/165] fedora: don't try to use biosdevname if it's not
 installed

If biosdevname isn't installed it doesn't make sense to try using it
for persistent device names.  Just treat lack of biosdevname as
virtual networking.
---
 plugins/guests/fedora/cap/configure_networks.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/fedora/cap/configure_networks.rb b/plugins/guests/fedora/cap/configure_networks.rb
index 2f67099cd..8e071b593 100644
--- a/plugins/guests/fedora/cap/configure_networks.rb
+++ b/plugins/guests/fedora/cap/configure_networks.rb
@@ -17,7 +17,7 @@ module VagrantPlugins
           virtual = false
           interface_names = Array.new
           machine.communicate.sudo("/usr/sbin/biosdevname; echo $?") do |_, result|
-            virtual = true if result.chomp == '4'
+            virtual = true if ['4', '127'].include? result.chomp
           end
 
           if virtual

From 7b36252dd2df4956b7382fa360c607faba28268f Mon Sep 17 00:00:00 2001
From: Chris Baldauf <chrisbaldauf@users.noreply.github.com>
Date: Tue, 19 May 2015 14:55:25 -0400
Subject: [PATCH 091/165] Update CHANGELOG.md

Change file to folder based on what I expect it should read.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10f22d3b3..c5d602708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -139,7 +139,7 @@ IMPROVEMENTS:
 
   - core: `has_plugin?` function now takes a second argument which is a
       version constraint requirement. [GH-4650]
-  - core: ".vagrantplugins" file in the same file as your Vagrantfile
+  - core: ".vagrantplugins" file in the same folder as your Vagrantfile
       will be loaded for defining inline plugins. [GH-3775]
   - commands/plugin: Plugin list machine-readable output contains the plugin
       name as the target for versions and other info. [GH-4506]

From f2d55793b3009abe110fea302278c8038fde5872 Mon Sep 17 00:00:00 2001
From: Shawn Neal <sneal@sneal.net>
Date: Tue, 19 May 2015 17:42:19 -0700
Subject: [PATCH 092/165] Use latest winrm-fs release

---
 vagrant.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vagrant.gemspec b/vagrant.gemspec
index 0e68a6d08..00b5ebb4c 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rest-client", ">= 1.6.0", "< 2.0"
   s.add_dependency "wdm", "~> 0.1.0"
   s.add_dependency "winrm", "~> 1.3"
-  s.add_dependency "winrm-fs", "~> 0.1.0"
+  s.add_dependency "winrm-fs", "~> 0.2.0"
 
   # We lock this down to avoid compilation issues.
   s.add_dependency "nokogiri", "= 1.6.3.1"

From c399f075d55a01c4b0f2d76c910fae8cc3e18161 Mon Sep 17 00:00:00 2001
From: Mikhail Zholobov <legal90@gmail.com>
Date: Sat, 4 Apr 2015 16:26:38 +0300
Subject: [PATCH 093/165] darwin/cap/change_host_name: Fixed invalid argument
 LocalHostName

---
 plugins/guests/darwin/cap/change_host_name.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/guests/darwin/cap/change_host_name.rb b/plugins/guests/darwin/cap/change_host_name.rb
index ad7242c91..c65c32642 100644
--- a/plugins/guests/darwin/cap/change_host_name.rb
+++ b/plugins/guests/darwin/cap/change_host_name.rb
@@ -6,7 +6,9 @@ module VagrantPlugins
           if !machine.communicate.test("hostname -f | grep '^#{name}$' || hostname -s | grep '^#{name}$'")
             machine.communicate.sudo("scutil --set ComputerName #{name}")
             machine.communicate.sudo("scutil --set HostName #{name}")
-            machine.communicate.sudo("scutil --set LocalHostName #{name}")
+            # LocalHostName shouldn't contain dots.
+            # It is used by Bonjour and visible through file sharing services.
+            machine.communicate.sudo("scutil --set LocalHostName #{name.gsub(/\.+/, '')}")
             machine.communicate.sudo("hostname #{name}")
           end
         end

From db1bd8d8c1ddda2c97cc8977f93281b9126d749a Mon Sep 17 00:00:00 2001
From: Jeremy Plichta <jplichta@gmail.com>
Date: Fri, 22 May 2015 15:18:11 -0600
Subject: [PATCH 094/165] change to https in sources.list.d

I started having this problem when running the docker provisioner (Vagrant 1.7.2):
Err http://get.docker.io docker/main amd64 Packages
  Undetermined Error
Err http://get.docker.io docker/main i386 Packages
  Undetermined Error
Ign http://get.docker.io docker/main Translation-en_US
Ign http://get.docker.io docker/main Translation-en


Stderr from the command:

stdin: is not a tty
W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-amd64/Packages  Undetermined Error

W: Failed to fetch http://get.docker.io/ubuntu/dists/docker/main/binary-i386/Packages  Undetermined Error

Changing this to https seemed to fix the problem for now.
---
 plugins/provisioners/docker/cap/debian/docker_install.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/provisioners/docker/cap/debian/docker_install.rb b/plugins/provisioners/docker/cap/debian/docker_install.rb
index 4e4a2ae6e..2ab526b51 100644
--- a/plugins/provisioners/docker/cap/debian/docker_install.rb
+++ b/plugins/provisioners/docker/cap/debian/docker_install.rb
@@ -15,7 +15,7 @@ module VagrantPlugins
               comm.sudo("apt-get update -y")
               comm.sudo("apt-get install -y --force-yes -q curl")
               comm.sudo("curl -sSL https://get.docker.com/gpg | apt-key add -")
-              comm.sudo("echo deb http://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
+              comm.sudo("echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list")
               comm.sudo("apt-get update")
               comm.sudo("echo lxc lxc/directory string /var/lib/lxc | debconf-set-selections")
               comm.sudo("apt-get install -y --force-yes -q xz-utils #{package} -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold'")

From b387f0e15d9c0bca7319b7ec7896b82b6da16249 Mon Sep 17 00:00:00 2001
From: Matija K <alh84001.hr@hotmail.com>
Date: Sun, 24 May 2015 12:39:28 +0200
Subject: [PATCH 095/165] Capability to mount smb shares in darwin guests

---
 lib/vagrant/errors.rb                         |  4 +++
 .../darwin/cap/choose_addressable_ip_addr.rb  | 20 +++++++++++++
 .../darwin/cap/mount_smb_shared_folder.rb     | 29 +++++++++++++++++++
 plugins/guests/darwin/plugin.rb               | 10 +++++++
 4 files changed, 63 insertions(+)
 create mode 100644 plugins/guests/darwin/cap/choose_addressable_ip_addr.rb
 create mode 100644 plugins/guests/darwin/cap/mount_smb_shared_folder.rb

diff --git a/lib/vagrant/errors.rb b/lib/vagrant/errors.rb
index de002ffed..3072d50ff 100644
--- a/lib/vagrant/errors.rb
+++ b/lib/vagrant/errors.rb
@@ -316,6 +316,10 @@ module Vagrant
       error_key(:corrupt_machine_index)
     end
 
+    class DarwinMountFailed < VagrantError
+      error_key(:darwin_mount_failed)
+    end
+
     class DarwinNFSMountFailed < VagrantError
       error_key(:darwin_nfs_mount_failed)
     end
diff --git a/plugins/guests/darwin/cap/choose_addressable_ip_addr.rb b/plugins/guests/darwin/cap/choose_addressable_ip_addr.rb
new file mode 100644
index 000000000..f5b578ebd
--- /dev/null
+++ b/plugins/guests/darwin/cap/choose_addressable_ip_addr.rb
@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      module ChooseAddressableIPAddr
+        def self.choose_addressable_ip_addr(machine, possible)
+          machine.communicate.tap do |comm|
+            possible.each do |ip|
+              command = "ping -c1 -t1 #{ip}"
+              if comm.test(command)
+                return ip
+              end
+            end
+          end
+
+          nil
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/darwin/cap/mount_smb_shared_folder.rb b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
new file mode 100644
index 000000000..2d47f97ce
--- /dev/null
+++ b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
@@ -0,0 +1,29 @@
+require "vagrant/util/retryable"
+require "shellwords"
+
+module VagrantPlugins
+  module GuestDarwin
+    module Cap
+      class MountSMBSharedFolder
+        extend Vagrant::Util::Retryable
+        def self.mount_smb_shared_folder(machine, name, guestpath, options)
+          expanded_guest_path = machine.guest.capability(:shell_expand_guest_path, guestpath)
+          machine.communicate.execute("mkdir -p #{expanded_guest_path}")
+
+          smb_password = Shellwords.shellescape(options[:smb_password])
+          mount_options = options[:mount_options];
+
+          mount_command = "mount -t smbfs " +
+            (mount_options ? "-o '#{mount_options.join(",")}' " : "") +
+            "'//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name}' " +
+            "#{expanded_guest_path}"
+          retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 5) do 
+            machine.communicate.sudo(
+              mount_command,
+              error_class: Vagrant::Errors::DarwinMountFailed)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/darwin/plugin.rb b/plugins/guests/darwin/plugin.rb
index 305154fde..8e6dc279b 100644
--- a/plugins/guests/darwin/plugin.rb
+++ b/plugins/guests/darwin/plugin.rb
@@ -16,6 +16,11 @@ module VagrantPlugins
         Cap::ChangeHostName
       end
 
+      guest_capability("darwin", "choose_addressable_ip_addr") do
+        require_relative "cap/choose_addressable_ip_addr"
+        Cap::ChooseAddressableIPAddr
+      end
+
       guest_capability("darwin", "configure_networks") do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
@@ -36,6 +41,11 @@ module VagrantPlugins
         Cap::MountNFSFolder
       end
 
+      guest_capability("darwin", "mount_smb_shared_folder") do
+        require_relative "cap/mount_smb_shared_folder"
+        Cap::MountSMBSharedFolder
+      end
+
       guest_capability("darwin", "mount_vmware_shared_folder") do
         require_relative "cap/mount_vmware_shared_folder"
         Cap::MountVmwareSharedFolder

From 09eec472f62ae31583666f6199ef98674185ea93 Mon Sep 17 00:00:00 2001
From: Matija K <alh84001.hr@hotmail.com>
Date: Sun, 24 May 2015 15:11:34 +0200
Subject: [PATCH 096/165] Mounting as regular user instead of root

---
 plugins/guests/darwin/cap/mount_smb_shared_folder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/guests/darwin/cap/mount_smb_shared_folder.rb b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
index 2d47f97ce..acd2b33a9 100644
--- a/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
@@ -18,7 +18,7 @@ module VagrantPlugins
             "'//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name}' " +
             "#{expanded_guest_path}"
           retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 5) do 
-            machine.communicate.sudo(
+            machine.communicate.execute(
               mount_command,
               error_class: Vagrant::Errors::DarwinMountFailed)
           end

From 1c04934d89e3e67399274409633e7be7a9571159 Mon Sep 17 00:00:00 2001
From: alh84001 <alh84001.hr@hotmail.com>
Date: Mon, 25 May 2015 15:35:06 +0200
Subject: [PATCH 097/165] Mounting to paths where user has no write permissions
 (e.g. /)

---
 .../guests/darwin/cap/mount_smb_shared_folder.rb   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/plugins/guests/darwin/cap/mount_smb_shared_folder.rb b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
index acd2b33a9..5f1cdaec4 100644
--- a/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
+++ b/plugins/guests/darwin/cap/mount_smb_shared_folder.rb
@@ -8,16 +8,24 @@ module VagrantPlugins
         extend Vagrant::Util::Retryable
         def self.mount_smb_shared_folder(machine, name, guestpath, options)
           expanded_guest_path = machine.guest.capability(:shell_expand_guest_path, guestpath)
-          machine.communicate.execute("mkdir -p #{expanded_guest_path}")
+
+          mount_point_owner = options[:owner];
+          if mount_point_owner
+            machine.communicate.sudo("mkdir -p #{expanded_guest_path}")
+            machine.communicate.sudo("chown #{mount_point_owner} #{expanded_guest_path}")
+          else
+            # fallback to assumption that user has permission
+            # to create the specified mountpoint
+            machine.communicate.execute("mkdir -p #{expanded_guest_path}")
+          end
 
           smb_password = Shellwords.shellescape(options[:smb_password])
           mount_options = options[:mount_options];
-
           mount_command = "mount -t smbfs " +
             (mount_options ? "-o '#{mount_options.join(",")}' " : "") +
             "'//#{options[:smb_username]}:#{smb_password}@#{options[:smb_host]}/#{name}' " +
             "#{expanded_guest_path}"
-          retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 5) do 
+          retryable(on: Vagrant::Errors::DarwinMountFailed, tries: 10, sleep: 2) do
             machine.communicate.execute(
               mount_command,
               error_class: Vagrant::Errors::DarwinMountFailed)

From b4e0e3a15932ff70c5ba89dab9947fa816de10e7 Mon Sep 17 00:00:00 2001
From: Richard Alvarez <alvarez.richard@gmail.com>
Date: Mon, 25 May 2015 22:03:48 -0400
Subject: [PATCH 098/165] Fixed deprecated link on chef_apply documentation

- links to http://docs.chef.io/recipes.html instead of https://docs.chef.io/essentials_cookbook_recipes.html
---
 website/docs/source/v2/provisioning/chef_apply.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/chef_apply.html.md b/website/docs/source/v2/provisioning/chef_apply.html.md
index 268894cb2..a5d53c564 100644
--- a/website/docs/source/v2/provisioning/chef_apply.html.md
+++ b/website/docs/source/v2/provisioning/chef_apply.html.md
@@ -48,7 +48,7 @@ the [common options for all Chef provisioners](/v2/provisioning/chef_common.html
 
 The easiest way to get started with the Chef Apply provisioner is to just
 specify an inline
-[Chef recipe](https://docs.getchef.com/essentials_cookbook_recipes.html). For
+[Chef recipe](http://docs.chef.io/recipes.html). For
 example:
 
 ```ruby

From a59247d4e5557d241570e2ba0928dbb24ce4a13e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:01:32 -0700
Subject: [PATCH 099/165] Trailing comma

---
 plugins/providers/virtualbox/driver/meta.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
index 8d83ff47f..10bef3f8f 100644
--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
@@ -50,7 +50,7 @@ module VagrantPlugins
             "4.1" => Version_4_1,
             "4.2" => Version_4_2,
             "4.3" => Version_4_3,
-            "5.0" => Version_5_0
+            "5.0" => Version_5_0,
           }
 
           if @version.start_with?("4.2.14")

From 8c3eaae09e1b12631738acb259033af0b8194c07 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:02:01 -0700
Subject: [PATCH 100/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10f22d3b3..f63040394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ IMPROVEMENTS:
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
   - providers/virtualbox: regexp supported for bridge configuration. [GH-5320]
+  - providers/virtualbox: add support for 5.0 [GH-5647]
 
 BUG FIXES:
 

From 74d22069d41b35bae50e32c1c68a92a4958afebb Mon Sep 17 00:00:00 2001
From: David Cournapeau <cournape@gmail.com>
Date: Tue, 11 Mar 2014 20:31:40 +0000
Subject: [PATCH 101/165] BUG: naive attempt at fixing #2970.

---
 plugins/provisioners/salt/config.rb      | 22 ++++++++++++++++++++++
 plugins/provisioners/salt/provisioner.rb |  5 +++++
 2 files changed, 27 insertions(+)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 4d97d942c..f31b65786 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -19,6 +19,7 @@ module VagrantPlugins
       attr_accessor :bootstrap_script
       attr_accessor :verbose
       attr_accessor :seed_master
+      attr_accessor :config_dir
       attr_reader   :pillar_data
       attr_accessor :colorize
       attr_accessor :log_level
@@ -56,6 +57,7 @@ module VagrantPlugins
         @install_syndic = UNSET_VALUE
         @no_minion = UNSET_VALUE
         @bootstrap_options = UNSET_VALUE
+        @config_dir = UNSET_VALUE
       end
 
       def finalize!
@@ -82,6 +84,7 @@ module VagrantPlugins
         @install_syndic     = nil if @install_syndic == UNSET_VALUE
         @no_minion          = nil if @no_minion == UNSET_VALUE
         @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
+        @config_dir         = nil if @config_dir == UNSET_VALUE
 
       end
 
@@ -90,6 +93,21 @@ module VagrantPlugins
         @pillar_data = Vagrant::Util::DeepMerge.deep_merge(@pillar_data, data)
       end
 
+      def default_config_dir(machine)
+        guest_type = machine.config.vm.guest
+        if guest_type == nil
+          guest_type = :linux
+        end
+
+        # FIXME: there should be a way to do that a bit smarter
+        if guest_type == :windows
+          return "C:\\salt"
+        else
+          return "/etc/salt"
+        end
+
+      end
+
       def validate(machine)
         errors = _detected_errors
         if @minion_config
@@ -129,6 +147,10 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.salt.must_accept_keys")
         end
 
+        if @config_dir == nil
+          @config_dir = default_config_dir(machine)
+        end
+
         return {"salt provisioner" => errors}
       end
 
diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 87af7cc7d..8b6c36578 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -305,6 +305,11 @@ module VagrantPlugins
       end
 
       def call_highstate
+        if @config.minion_config
+          @machine.env.ui.info "Copying salt minion config to #{@config.config dir}"
+          @machine.communicate.upload(expanded_path(@config.minion_config).to_s, @config.config_dir + "/minion")
+        end
+
         if @config.run_highstate
           @machine.env.ui.info "Calling state.highstate... (this may take a while)"
           if @config.install_master

From 0b85e04399e56e6a9fe2d8271592376b960f9c51 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:39:18 -0700
Subject: [PATCH 102/165] Minor style fixes for salt config_dir

---
 plugins/provisioners/salt/config.rb | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index f31b65786..545ea4aa5 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -94,10 +94,7 @@ module VagrantPlugins
       end
 
       def default_config_dir(machine)
-        guest_type = machine.config.vm.guest
-        if guest_type == nil
-          guest_type = :linux
-        end
+        guest_type = machine.config.vm.guest || :linux
 
         # FIXME: there should be a way to do that a bit smarter
         if guest_type == :windows
@@ -105,7 +102,6 @@ module VagrantPlugins
         else
           return "/etc/salt"
         end
-
       end
 
       def validate(machine)
@@ -147,7 +143,7 @@ module VagrantPlugins
           errors << I18n.t("vagrant.provisioners.salt.must_accept_keys")
         end
 
-        if @config_dir == nil
+        if @config_dir.nil?
           @config_dir = default_config_dir(machine)
         end
 

From b73415e84d3cf0418789349cc8c3941c1a9a147d Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:40:27 -0700
Subject: [PATCH 103/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f63040394..a0c1bddbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ IMPROVEMENTS:
   - guests/photon: Initial support [GH-5612]
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
+  - provisioners/salt: add configurable `config_dir` [GH-3138]
   - providers/virtualbox: regexp supported for bridge configuration. [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
 

From 3528af2db915c8592cc8cc7959d44f681634ace8 Mon Sep 17 00:00:00 2001
From: David Cournapeau <cournape@gmail.com>
Date: Sat, 15 Mar 2014 20:56:24 +0000
Subject: [PATCH 104/165] ENH: simpler masterless configuration.

---
 plugins/provisioners/salt/config.rb      |  9 ++++++---
 plugins/provisioners/salt/provisioner.rb | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/salt/config.rb b/plugins/provisioners/salt/config.rb
index 545ea4aa5..f47770d97 100644
--- a/plugins/provisioners/salt/config.rb
+++ b/plugins/provisioners/salt/config.rb
@@ -23,6 +23,8 @@ module VagrantPlugins
       attr_reader   :pillar_data
       attr_accessor :colorize
       attr_accessor :log_level
+      attr_accessor :masterless
+      attr_accessor :minion_id
 
       ## bootstrap options
       attr_accessor :temp_config_dir
@@ -58,6 +60,8 @@ module VagrantPlugins
         @no_minion = UNSET_VALUE
         @bootstrap_options = UNSET_VALUE
         @config_dir = UNSET_VALUE
+        @masterless = UNSET_VALUE
+        @minion_id = UNSET_VALUE
       end
 
       def finalize!
@@ -85,7 +89,8 @@ module VagrantPlugins
         @no_minion          = nil if @no_minion == UNSET_VALUE
         @bootstrap_options  = nil if @bootstrap_options == UNSET_VALUE
         @config_dir         = nil if @config_dir == UNSET_VALUE
-
+        @masterless 	    = false if @masterless == UNSET_VALUE
+        @minion_id 	    = nil if @minion_id == UNSET_VALUE
       end
 
       def pillar(data)
@@ -149,8 +154,6 @@ module VagrantPlugins
 
         return {"salt provisioner" => errors}
       end
-
-
     end
   end
 end
diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 8b6c36578..31ea11531 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -304,13 +304,29 @@ module VagrantPlugins
         end
       end
 
+      def call_masterless
+        @machine.env.ui.info "Calling state.highstate in local mode... (this may take a while)"
+        cmd = "salt-call state.highstate --local"
+        if @config.minion_id
+          cmd += " --id #{@config.minion_id}"
+        end
+        cmd += " -l debug#{get_pillar}"
+        @machine.communicate.sudo(cmd) do |type, data|
+          if @config.verbose
+            @machine.env.ui.info(data)
+          end
+        end
+      end
+
       def call_highstate
         if @config.minion_config
           @machine.env.ui.info "Copying salt minion config to #{@config.config dir}"
           @machine.communicate.upload(expanded_path(@config.minion_config).to_s, @config.config_dir + "/minion")
         end
 
-        if @config.run_highstate
+        if @config.masterless
+          call_masterless
+        elsif @config.run_highstate
           @machine.env.ui.info "Calling state.highstate... (this may take a while)"
           if @config.install_master
             @machine.communicate.sudo("salt '*' saltutil.sync_all")

From 9adf6683de9544e66967d3421aead4528c651fe2 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:43:15 -0700
Subject: [PATCH 105/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0c1bddbb..6d707ae0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ IMPROVEMENTS:
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
   - provisioners/salt: add configurable `config_dir` [GH-3138]
+  - provisioners/salt: add support for masterless configuration [GH-3235]
   - providers/virtualbox: regexp supported for bridge configuration. [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
 

From 475efb1607d9e9def4690d69044bbdb0d97820f2 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:45:45 -0700
Subject: [PATCH 106/165] Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d707ae0e..ced7c07a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,8 @@ IMPROVEMENTS:
       [GH-5290]
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
-  - providers/virtualbox: regexp supported for bridge configuration. [GH-5320]
+  - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
+  - providers/virtualbox: regexp supported for bridge configuration [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
 
 BUG FIXES:

From 6699e02bcfd0fc048f77fe25bd3b2a1e0942d6e0 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:47:23 -0700
Subject: [PATCH 107/165] Minor cleanup

---
 test/unit/plugins/providers/hyperv/config_test.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/unit/plugins/providers/hyperv/config_test.rb b/test/unit/plugins/providers/hyperv/config_test.rb
index e8595aef7..e7b5a6d71 100644
--- a/test/unit/plugins/providers/hyperv/config_test.rb
+++ b/test/unit/plugins/providers/hyperv/config_test.rb
@@ -14,6 +14,7 @@ describe VagrantPlugins::HyperV::Config do
       expect(subject.ip_address_timeout).to eq(120)
     end
   end
+
   describe "#vlan_id" do
     it "can be set" do
       subject.vlan_id = 100
@@ -21,6 +22,7 @@ describe VagrantPlugins::HyperV::Config do
       expect(subject.vlan_id).to eq(100)
     end
   end
+
   describe "#vmname" do
     it "can be set" do
       subject.vmname = "test"
@@ -28,6 +30,7 @@ describe VagrantPlugins::HyperV::Config do
       expect(subject.vmname).to eq("test")
     end
   end
+
   describe "#memory" do
     it "can be set" do
       subject.memory = 512
@@ -35,6 +38,7 @@ describe VagrantPlugins::HyperV::Config do
       expect(subject.memory).to eq(512)
     end
   end
+
   describe "#maxmemory" do
     it "can be set" do
       subject.maxmemory = 1024
@@ -42,6 +46,7 @@ describe VagrantPlugins::HyperV::Config do
       expect(subject.maxmemory).to eq(1024)
     end
   end
+
   describe "#cpus" do
     it "can be set" do
       subject.cpus = 2

From 8f8279c5bcdfc13354d77ae083ae77e10e7fd45c Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:47:45 -0700
Subject: [PATCH 108/165] Update CHANGLEOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ced7c07a0..cf4d136dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ IMPROVEMENTS:
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
+  - providers/hyperv: allow configuring VladID [GH-5539]
   - providers/virtualbox: regexp supported for bridge configuration [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
 

From f6ef5e48049aa87d73b21aedb63cba9d1f13bf79 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:51:34 -0700
Subject: [PATCH 109/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4d136dd..e8447d5f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ BUG FIXES:
   - core: push configurations are validated with global configs [GH-5130]
   - core: remove executable permissions on internal file [GH-5220]
   - core: check name and version in `has_plugin?` [GH-5218]
+  - core: do not create duplicates when defining two private network addresses [GH-5325]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
   - core/windows: allow Windows UNC paths to allow more than 256
       characters [GH-4815]

From a6bfa80d5ee09f500405ddcd376a3b4f1522f62f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:52:24 -0700
Subject: [PATCH 110/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8447d5f6..ccf78e849 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ BUG FIXES:
   - core: remove executable permissions on internal file [GH-5220]
   - core: check name and version in `has_plugin?` [GH-5218]
   - core: do not create duplicates when defining two private network addresses [GH-5325]
+  - core: update ssh to check for Plink [GH-5604]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
   - core/windows: allow Windows UNC paths to allow more than 256
       characters [GH-4815]

From c8733ac44aafef7c3407e323931e1dd7f7e0a3e5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:53:34 -0700
Subject: [PATCH 111/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccf78e849..0ff8dccba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ BUG FIXES:
   - hosts/nfs: allow colons (`:`) in NFS IDs [GH-5222]
   - guests/debian: Halt works properly on Debian 8. [GH-5369]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]
+  - guests/tinycore: fix change hostname functionality [GH-5623]
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]
   - guests/windows: Changing hostname requires reboot again since
       the non-reboot code path was crashing Windows server. [GH-5261]

From 7e0ca7bb2cadc43beacbf49c2323192121d86917 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:56:02 -0700
Subject: [PATCH 112/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ff8dccba..8d2176dff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ IMPROVEMENTS:
       [GH-5290]
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
+  - provisioners/salt: provider path to missing file in errors [GH-5637]
   - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
   - providers/hyperv: allow configuring VladID [GH-5539]
   - providers/virtualbox: regexp supported for bridge configuration [GH-5320]

From a775ecf9b8df3f55172491eebf6bae4009d8534e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:57:48 -0700
Subject: [PATCH 113/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d2176dff..03bf8e2af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ BUG FIXES:
   - core: check name and version in `has_plugin?` [GH-5218]
   - core: do not create duplicates when defining two private network addresses [GH-5325]
   - core: update ssh to check for Plink [GH-5604]
+  - core: do not report plugins as installed when plugins are disabled [GH-5698, GH-5430]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
   - core/windows: allow Windows UNC paths to allow more than 256
       characters [GH-4815]

From 105cc4645777a29a530d368eef9b969bbadd1e0e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:58:44 -0700
Subject: [PATCH 114/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03bf8e2af..bdc91c362 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@ BUG FIXES:
       the error messages shown to be more human-friendly. [GH-4943]
   - hosts/nfs: allow colons (`:`) in NFS IDs [GH-5222]
   - guests/debian: Halt works properly on Debian 8. [GH-5369]
+  - guests/fedora: recognize future fedora releases [GH-5730]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]
   - guests/tinycore: fix change hostname functionality [GH-5623]
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]

From b5d7559025d47da34d856a2d21d344c9d80ad446 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 11:59:42 -0700
Subject: [PATCH 115/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bdc91c362..ff6c9b559 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ BUG FIXES:
   - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
   - provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018]
   - provisioners/docker: Only add docker user to group if exists. [GH-5315]
+  - provisioners/docker: Use https for repo [GH-5749]
   - provisioners/chef: Use `command -v` to check for binary instead of
       `which` since that doesn't exist on some systems. [GH-5170]
   - provisioners/chef-zero: support more chef-zero/local mode attributes [GH-5339]

From 08f240668b71cfd5167f174491bb4dfce2c5e8cf Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:02:10 -0700
Subject: [PATCH 116/165] Minor cleanup

---
 plugins/providers/virtualbox/action/network.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/providers/virtualbox/action/network.rb b/plugins/providers/virtualbox/action/network.rb
index df1146f35..a95b79857 100644
--- a/plugins/providers/virtualbox/action/network.rb
+++ b/plugins/providers/virtualbox/action/network.rb
@@ -157,9 +157,7 @@ module VagrantPlugins
             @logger.debug("Bridge was directly specified in config, searching for: #{config[:bridge]}")
 
             # Search for a matching bridged interface
-            bridges = config[:bridge]
-            bridges = [bridges] if not bridges.respond_to?(:each)
-            bridges.each do |bridge|
+            Array(config[:bridge]).each do |bridge|
               bridge = bridge.downcase if bridge.respond_to?(:downcase)
               bridgedifs.each do |interface|
                 if bridge === interface[:name].downcase

From 5a86a9d8dfd49768f394639de27910205b254f7a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:03:10 -0700
Subject: [PATCH 117/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff6c9b559..b58c45b36 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ IMPROVEMENTS:
   - providers/hyperv: allow configuring VladID [GH-5539]
   - providers/virtualbox: regexp supported for bridge configuration [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
+  - providers/virtualbox: handle a list of bridged NICs [GH-5691]
 
 BUG FIXES:
 

From d21abb05ac79ac1d478a37807ff4ccea7affe0c0 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:04:39 -0700
Subject: [PATCH 118/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b58c45b36..7a7896c8a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ BUG FIXES:
   - core: do not create duplicates when defining two private network addresses [GH-5325]
   - core: update ssh to check for Plink [GH-5604]
   - core: do not report plugins as installed when plugins are disabled [GH-5698, GH-5430]
+  - core: Only take files when packaging a box to avoid duplicates [GH-5658, GH-5657]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
   - core/windows: allow Windows UNC paths to allow more than 256
       characters [GH-4815]

From 5fb996c6b5f182a72587583b61cb9fdb5e82fe07 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:05:57 -0700
Subject: [PATCH 119/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a7896c8a..10e8eb6b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ BUG FIXES:
   - communicators/winrm: improve error handling significantly and improve
       the error messages shown to be more human-friendly. [GH-4943]
   - hosts/nfs: allow colons (`:`) in NFS IDs [GH-5222]
+  - guests/darwin: remove dots from LocalHostName [GH-5558]
   - guests/debian: Halt works properly on Debian 8. [GH-5369]
   - guests/fedora: recognize future fedora releases [GH-5730]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]

From 5597b823150deddaa4d83c02ca0c58849afe9e37 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:08:46 -0700
Subject: [PATCH 120/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10e8eb6b1..f76cd408a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ BUG FIXES:
   - guests/darwin: remove dots from LocalHostName [GH-5558]
   - guests/debian: Halt works properly on Debian 8. [GH-5369]
   - guests/fedora: recognize future fedora releases [GH-5730]
+  - guests/fedora: reload iface connection by NetworkManager [GH-5709]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]
   - guests/tinycore: fix change hostname functionality [GH-5623]
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]

From 434483dc07e8e5560a89701fb493ecdccb80467e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:09:34 -0700
Subject: [PATCH 121/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f76cd408a..e14f5e094 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ BUG FIXES:
   - guests/debian: Halt works properly on Debian 8. [GH-5369]
   - guests/fedora: recognize future fedora releases [GH-5730]
   - guests/fedora: reload iface connection by NetworkManager [GH-5709]
+  - guests/fedora: do not use biosdevname if it is not installed [GH-5707]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]
   - guests/tinycore: fix change hostname functionality [GH-5623]
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]

From e46060c4942d73598d6259a70107f4503968cc3e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:19:53 -0700
Subject: [PATCH 122/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad1d770a5..1d6697478 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 IMPROVEMENTS:
 
+  - core: add password authentication to rdp_info hash [GH-4726]
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]

From 571b6ba7e6a1eb329cd0da38d70f4ac34960e5e5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:32:50 -0700
Subject: [PATCH 123/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d6697478..1e6a4a016 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 IMPROVEMENTS:
 
   - core: add password authentication to rdp_info hash [GH-4726]
+  - core: improve error message when packaging fails [GH-5399]
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]

From a0b86a84742b575189e6247cafa0789201099d43 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:34:05 -0700
Subject: [PATCH 124/165] Style fixes

---
 lib/vagrant/action/builtin/box_add.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index fdfb4edc4..9d308b1f8 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -420,15 +420,15 @@ module Vagrant
             show_url = opts[:show_url]
             show_url ||= url
 
-            textLoading = "vagrant.box_downloading"
+            translation = "vagrant.box_downloading"
 
             # Adjust status message when 'downloading' a local box.
-            if(show_url.start_with?('file://'))
-              textLoading = "vagrant.box_unpacking"
+            if show_url.start_with?("file://")
+              translation = "vagrant.box_unpacking"
             end
 
             env[:ui].detail(I18n.t(
-              textLoading,
+              translation,
               url: show_url))
             if File.file?(d.destination)
               env[:ui].info(I18n.t("vagrant.actions.box.download.resuming"))

From 017e61541a722ed4c2476c8fd8372c1104e7ed35 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:34:42 -0700
Subject: [PATCH 125/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e6a4a016..9aea9aadc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ IMPROVEMENTS:
 
   - core: add password authentication to rdp_info hash [GH-4726]
   - core: improve error message when packaging fails [GH-5399]
+  - core: improve message when adding a box from a file path [GH-5395]
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]

From 527e06c6906d8353617b39267d94e1f2be47d5d4 Mon Sep 17 00:00:00 2001
From: Marcus Young <Marcus.Young@icainformatics.com>
Date: Tue, 21 Jan 2014 11:04:28 -0600
Subject: [PATCH 126/165] Adding support for gateway in RHEL/CentOS ifcfg
 script

---
 templates/guests/redhat/network_static.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/guests/redhat/network_static.erb b/templates/guests/redhat/network_static.erb
index c28dd74cb..3f2a8b60a 100644
--- a/templates/guests/redhat/network_static.erb
+++ b/templates/guests/redhat/network_static.erb
@@ -6,5 +6,6 @@ ONBOOT=yes
 IPADDR=<%= options[:ip] %>
 NETMASK=<%= options[:netmask] %>
 DEVICE=eth<%= options[:interface] %>
+<%= options[:gateway] ? "GATEWAY=#{options[:gateway]}" : '' %>
 PEERDNS=no
 #VAGRANT-END

From 55e4308e226bf3bb2995e4c2b35becfd383333b6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 15 May 2015 12:54:57 -0400
Subject: [PATCH 127/165] Add gateway to networks + template tests

---
 templates/guests/arch/network_static.erb      |   3 +
 templates/guests/debian/network_static.erb    |   3 +
 templates/guests/fedora/network_static.erb    |   8 +-
 templates/guests/freebsd/network_static.erb   |   3 +
 templates/guests/funtoo/network_static.erb    |   6 +-
 templates/guests/gentoo/network_static.erb    |   3 +
 templates/guests/redhat/network_static.erb    |   4 +-
 templates/guests/suse/network_static.erb      |   5 +-
 .../guests/arch/network_dhcp_test.rb          |  19 +++
 .../guests/arch/network_static_test.rb        |  37 +++++
 .../guests/debian/network_dhcp_test.rb        |  41 +++++
 .../guests/debian/network_static_test.rb      |  43 ++++++
 .../guests/fedora/network_dhcp_test.rb        |  21 +++
 .../guests/fedora/network_static_test.rb      |  71 +++++++++
 .../guests/freebsd/network_dhcp_test.rb       |  16 ++
 .../guests/freebsd/network_static_test.rb     |  39 +++++
 .../guests/funtoo/network_dhcp_test.rb        |  19 +++
 .../guests/funtoo/network_static_test.rb      | 141 ++++++++++++++++++
 .../guests/gentoo/network_dhcp_test.rb        |  19 +++
 .../guests/gentoo/network_static_test.rb      |  37 +++++
 .../guests/netbsd/network_dhcp_test.rb        |  18 +++
 .../guests/netbsd/network_static_test.rb      |  20 +++
 .../guests/redhat/network_dhcp_test.rb        |  21 +++
 .../guests/redhat/network_static_test.rb      |  49 ++++++
 .../guests/suse/network_dhcp_test.rb          |  21 +++
 .../guests/suse/network_static_test.rb        |  49 ++++++
 .../v2/networking/private_network.html.md     |   3 +
 27 files changed, 714 insertions(+), 5 deletions(-)
 create mode 100644 test/unit/templates/guests/arch/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/arch/network_static_test.rb
 create mode 100644 test/unit/templates/guests/debian/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/debian/network_static_test.rb
 create mode 100644 test/unit/templates/guests/fedora/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/fedora/network_static_test.rb
 create mode 100644 test/unit/templates/guests/freebsd/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/freebsd/network_static_test.rb
 create mode 100644 test/unit/templates/guests/funtoo/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/funtoo/network_static_test.rb
 create mode 100644 test/unit/templates/guests/gentoo/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/gentoo/network_static_test.rb
 create mode 100644 test/unit/templates/guests/netbsd/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/netbsd/network_static_test.rb
 create mode 100644 test/unit/templates/guests/redhat/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/redhat/network_static_test.rb
 create mode 100644 test/unit/templates/guests/suse/network_dhcp_test.rb
 create mode 100644 test/unit/templates/guests/suse/network_static_test.rb

diff --git a/templates/guests/arch/network_static.erb b/templates/guests/arch/network_static.erb
index ee58ee75a..f8cb06f1b 100644
--- a/templates/guests/arch/network_static.erb
+++ b/templates/guests/arch/network_static.erb
@@ -3,3 +3,6 @@ Description='A basic static ethernet connection'
 Interface=<%= options[:device] %>
 IP=static
 Address=('<%= options[:ip]%>/24')
+<% if options[:gateway] %>
+Gateway='<%= options[:gateway] %>'
+<% end %>
diff --git a/templates/guests/debian/network_static.erb b/templates/guests/debian/network_static.erb
index fa505afa9..91f0cd62e 100644
--- a/templates/guests/debian/network_static.erb
+++ b/templates/guests/debian/network_static.erb
@@ -4,4 +4,7 @@ auto eth<%= options[:interface] %>
 iface eth<%= options[:interface] %> inet static
       address <%= options[:ip] %>
       netmask <%= options[:netmask] %>
+<% if options[:gateway] %>
+      gateway <%= options[:gateway] %>
+<% end %>
 #VAGRANT-END
diff --git a/templates/guests/fedora/network_static.erb b/templates/guests/fedora/network_static.erb
index dc8e85c1e..000ea6150 100644
--- a/templates/guests/fedora/network_static.erb
+++ b/templates/guests/fedora/network_static.erb
@@ -6,7 +6,11 @@ ONBOOT=yes
 IPADDR=<%= options[:ip] %>
 NETMASK=<%= options[:netmask] %>
 DEVICE=<%= options[:device] %>
-<%= options[:gateway] ? "GATEWAY=#{options[:gateway]}" : '' %>
-<%= options[:mac_address] ? "HWADDR=#{options[:mac_address]}" : '' %>
+<% if options[:gateway] %>
+GATEWAY=<%= options[:gateway] %>
+<% end %>
+<% if options[:mac_address] %>
+HWADDR=<%= options[:mac_address] %>
+<% end %>
 PEERDNS=no
 #VAGRANT-END
diff --git a/templates/guests/freebsd/network_static.erb b/templates/guests/freebsd/network_static.erb
index 0edc518cb..e73c7c124 100644
--- a/templates/guests/freebsd/network_static.erb
+++ b/templates/guests/freebsd/network_static.erb
@@ -1,3 +1,6 @@
 #VAGRANT-BEGIN
 ifconfig_<%= ifname %>="inet <%= options[:ip] %> netmask <%= options[:netmask] %>"
+<% if options[:gateway] %>
+default_router="<%= options[:gateway] %>"
+<% end %>
 #VAGRANT-END
diff --git a/templates/guests/funtoo/network_static.erb b/templates/guests/funtoo/network_static.erb
index ab6a09d10..001df7419 100644
--- a/templates/guests/funtoo/network_static.erb
+++ b/templates/guests/funtoo/network_static.erb
@@ -2,5 +2,9 @@
 # The contents below are automatically generated by Vagrant. Do not modify.
 template='interface'
 ipaddr='<%= options[:ip] %>/<%= options[:netmask] %>'
-<%= [:gateway, :nameservers, :domain, :route, :gateway6, :route6, :mtu].reduce([]) { |a,i| a.push("#{i}=#{options[i]}") if options[i]; a }.join("\n") %>
+<% [:gateway, :nameservers, :domain, :route, :gateway6, :route6, :mtu].each do |key| %>
+<% if options[key] %>
+<%= key %>='<%= options[key] %>'
+<% end %>
+<% end %>
 #VAGRANT-END
diff --git a/templates/guests/gentoo/network_static.erb b/templates/guests/gentoo/network_static.erb
index 0df432cb0..fe6c77194 100644
--- a/templates/guests/gentoo/network_static.erb
+++ b/templates/guests/gentoo/network_static.erb
@@ -1,4 +1,7 @@
 #VAGRANT-BEGIN
 # The contents below are automatically generated by Vagrant. Do not modify.
 config_eth<%= options[:interface] %>=("<%= options[:ip] %> netmask <%= options[:netmask] %>")
+<% if options[:gateway] %>
+gateways_eth<%= options[:interface] %>="<%= options[:gateway] %>"
+<% end %>
 #VAGRANT-END
diff --git a/templates/guests/redhat/network_static.erb b/templates/guests/redhat/network_static.erb
index 3f2a8b60a..53ef59571 100644
--- a/templates/guests/redhat/network_static.erb
+++ b/templates/guests/redhat/network_static.erb
@@ -6,6 +6,8 @@ ONBOOT=yes
 IPADDR=<%= options[:ip] %>
 NETMASK=<%= options[:netmask] %>
 DEVICE=eth<%= options[:interface] %>
-<%= options[:gateway] ? "GATEWAY=#{options[:gateway]}" : '' %>
+<% if options[:gateway] %>
+GATEWAY=<%= options[:gateway] %>
+<% end %>
 PEERDNS=no
 #VAGRANT-END
diff --git a/templates/guests/suse/network_static.erb b/templates/guests/suse/network_static.erb
index 7388fc355..c9270d7cd 100644
--- a/templates/guests/suse/network_static.erb
+++ b/templates/guests/suse/network_static.erb
@@ -4,7 +4,10 @@ BOOTPROTO='static'
 IPADDR='<%= options[:ip] %>'
 NETMASK='<%= options[:netmask] %>'
 DEVICE='eth<%= options[:interface] %>'
-PEERDNS=no
+<% if options[:gateway] %>
+GATEWAY='<%= options[:gateway] %>'
+<% end %>
+PEERDNS='no'
 STARTMODE='auto'
 USERCONTROL='no'
 #VAGRANT-END
diff --git a/test/unit/templates/guests/arch/network_dhcp_test.rb b/test/unit/templates/guests/arch/network_dhcp_test.rb
new file mode 100644
index 000000000..10a3f2c7d
--- /dev/null
+++ b/test/unit/templates/guests/arch/network_dhcp_test.rb
@@ -0,0 +1,19 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/arch/network_dhcp" do
+  let(:template) { "guests/arch/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      Description='A basic dhcp ethernet connection'
+      Interface=en0
+      Connection=ethernet
+      IP=dhcp
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/arch/network_static_test.rb b/test/unit/templates/guests/arch/network_static_test.rb
new file mode 100644
index 000000000..375ec67c5
--- /dev/null
+++ b/test/unit/templates/guests/arch/network_static_test.rb
@@ -0,0 +1,37 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/arch/network_static" do
+  let(:template) { "guests/arch/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device: "en0",
+      ip:     "1.1.1.1",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      Connection=ethernet
+      Description='A basic static ethernet connection'
+      Interface=en0
+      IP=static
+      Address=('1.1.1.1/24')
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      gateway: "1.2.3.4",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      Connection=ethernet
+      Description='A basic static ethernet connection'
+      Interface=en0
+      IP=static
+      Address=('1.1.1.1/24')
+      Gateway='1.2.3.4'
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/debian/network_dhcp_test.rb b/test/unit/templates/guests/debian/network_dhcp_test.rb
new file mode 100644
index 000000000..766227461
--- /dev/null
+++ b/test/unit/templates/guests/debian/network_dhcp_test.rb
@@ -0,0 +1,41 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/debian/network_dhcp" do
+  let(:template) { "guests/debian/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      auto eth
+      iface eth inet dhcp
+          post-up route del default dev $IFACE || true
+      #VAGRANT-END
+    EOH
+  end
+
+  context "when use_dhcp_assigned_default_route is set" do
+    it "renders the template" do
+      result = Vagrant::Util::TemplateRenderer.render(template, options: {
+        device: "en0",
+        use_dhcp_assigned_default_route: true,
+      })
+      expect(result).to eq <<-EOH.gsub(/^ {8}/, "")
+        #VAGRANT-BEGIN
+        # The contents below are automatically generated by Vagrant. Do not modify.
+        auto eth
+        iface eth inet dhcp
+            # We need to disable eth0, see GH-2648
+            post-up route del default dev eth0
+            post-up dhclient $IFACE
+            pre-down route add default dev eth0
+        #VAGRANT-END
+      EOH
+    end
+  end
+end
diff --git a/test/unit/templates/guests/debian/network_static_test.rb b/test/unit/templates/guests/debian/network_static_test.rb
new file mode 100644
index 000000000..936a6a806
--- /dev/null
+++ b/test/unit/templates/guests/debian/network_static_test.rb
@@ -0,0 +1,43 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/debian/network_static" do
+  let(:template) { "guests/debian/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      auto eth
+      iface eth inet static
+            address 1.1.1.1
+            netmask 255.255.0.0
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      gateway: "1.2.3.4",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      auto eth
+      iface eth inet static
+            address 1.1.1.1
+            netmask 255.255.0.0
+            gateway 1.2.3.4
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/fedora/network_dhcp_test.rb b/test/unit/templates/guests/fedora/network_dhcp_test.rb
new file mode 100644
index 000000000..b257aa76e
--- /dev/null
+++ b/test/unit/templates/guests/fedora/network_dhcp_test.rb
@@ -0,0 +1,21 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/fedora/network_dhcp" do
+  let(:template) { "guests/fedora/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      BOOTPROTO=dhcp
+      ONBOOT=yes
+      DEVICE=en0
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/fedora/network_static_test.rb b/test/unit/templates/guests/fedora/network_static_test.rb
new file mode 100644
index 000000000..f6e879fa2
--- /dev/null
+++ b/test/unit/templates/guests/fedora/network_static_test.rb
@@ -0,0 +1,71 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/fedora/network_static" do
+  let(:template) { "guests/fedora/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      NM_CONTROLLED=no
+      BOOTPROTO=none
+      ONBOOT=yes
+      IPADDR=1.1.1.1
+      NETMASK=255.255.0.0
+      DEVICE=en0
+      PEERDNS=no
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      gateway: "1.2.3.4",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      NM_CONTROLLED=no
+      BOOTPROTO=none
+      ONBOOT=yes
+      IPADDR=1.1.1.1
+      NETMASK=255.255.0.0
+      DEVICE=en0
+      GATEWAY=1.2.3.4
+      PEERDNS=no
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the mac_address" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:      "en0",
+      ip:          "1.1.1.1",
+      netmask:     "255.255.0.0",
+      mac_address: "abcd1234",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      NM_CONTROLLED=no
+      BOOTPROTO=none
+      ONBOOT=yes
+      IPADDR=1.1.1.1
+      NETMASK=255.255.0.0
+      DEVICE=en0
+      HWADDR=abcd1234
+      PEERDNS=no
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/freebsd/network_dhcp_test.rb b/test/unit/templates/guests/freebsd/network_dhcp_test.rb
new file mode 100644
index 000000000..322de3746
--- /dev/null
+++ b/test/unit/templates/guests/freebsd/network_dhcp_test.rb
@@ -0,0 +1,16 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/freebsd/network_dhcp" do
+  let(:template) { "guests/freebsd/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, ifname: "vtneten0")
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      ifconfig_vtneten0="DHCP"
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/freebsd/network_static_test.rb b/test/unit/templates/guests/freebsd/network_static_test.rb
new file mode 100644
index 000000000..ca9eb0153
--- /dev/null
+++ b/test/unit/templates/guests/freebsd/network_static_test.rb
@@ -0,0 +1,39 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/freebsd/network_static" do
+  let(:template) { "guests/freebsd/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template,
+      ifname: "vtneten0",
+      options: {
+        ip:      "1.1.1.1",
+        netmask: "255.255.0.0",
+      },
+    )
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      ifconfig_vtneten0="inet 1.1.1.1 netmask 255.255.0.0"
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template,
+      ifname: "vtneten0",
+      options: {
+        ip:      "1.1.1.1",
+        netmask: "255.255.0.0",
+        gateway: "1.2.3.4",
+      },
+    )
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      ifconfig_vtneten0="inet 1.1.1.1 netmask 255.255.0.0"
+      default_router="1.2.3.4"
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/funtoo/network_dhcp_test.rb b/test/unit/templates/guests/funtoo/network_dhcp_test.rb
new file mode 100644
index 000000000..0e3cafb1c
--- /dev/null
+++ b/test/unit/templates/guests/funtoo/network_dhcp_test.rb
@@ -0,0 +1,19 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/funtoo/network_dhcp" do
+  let(:template) { "guests/funtoo/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='dhcp'
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/funtoo/network_static_test.rb b/test/unit/templates/guests/funtoo/network_static_test.rb
new file mode 100644
index 000000000..5a14312d2
--- /dev/null
+++ b/test/unit/templates/guests/funtoo/network_static_test.rb
@@ -0,0 +1,141 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/funtoo/network_static" do
+  let(:template) { "guests/funtoo/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      gateway: "1.2.3.4",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      gateway='1.2.3.4'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the nameservers" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:      "en0",
+      ip:          "1.1.1.1",
+      netmask:     "255.255.0.0",
+      nameservers: "ns1.company.com",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      nameservers='ns1.company.com'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the domain" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      domain:  "company.com",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      domain='company.com'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the route" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      route:   "5.6.7.8",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      route='5.6.7.8'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway6" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:   "en0",
+      ip:       "1.1.1.1",
+      netmask:  "255.255.0.0",
+      gateway6: "aaaa:0000",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      gateway6='aaaa:0000'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the route6" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      route6:  "bbbb:1111",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      route6='bbbb:1111'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the mtu" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      mtu:     "1",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      template='interface'
+      ipaddr='1.1.1.1/255.255.0.0'
+      mtu='1'
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/gentoo/network_dhcp_test.rb b/test/unit/templates/guests/gentoo/network_dhcp_test.rb
new file mode 100644
index 000000000..7885c2acc
--- /dev/null
+++ b/test/unit/templates/guests/gentoo/network_dhcp_test.rb
@@ -0,0 +1,19 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/gentoo/network_dhcp" do
+  let(:template) { "guests/gentoo/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      config_ethen0="dhcp"
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/gentoo/network_static_test.rb b/test/unit/templates/guests/gentoo/network_static_test.rb
new file mode 100644
index 000000000..e1eb8ce1a
--- /dev/null
+++ b/test/unit/templates/guests/gentoo/network_static_test.rb
@@ -0,0 +1,37 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/gentoo/network_static" do
+  let(:template) { "guests/gentoo/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+      ip:        "1.1.1.1",
+      netmask:   "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      config_ethen0=("1.1.1.1 netmask 255.255.0.0")
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+      ip:        "1.1.1.1",
+      netmask:   "255.255.0.0",
+      gateway:   "1.2.3.4",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      config_ethen0=("1.1.1.1 netmask 255.255.0.0")
+      gateways_ethen0="1.2.3.4"
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/netbsd/network_dhcp_test.rb b/test/unit/templates/guests/netbsd/network_dhcp_test.rb
new file mode 100644
index 000000000..c2f68d7ba
--- /dev/null
+++ b/test/unit/templates/guests/netbsd/network_dhcp_test.rb
@@ -0,0 +1,18 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/netbsd/network_dhcp" do
+  let(:template) { "guests/netbsd/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      ifconfig_wmen0=dhcp
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/netbsd/network_static_test.rb b/test/unit/templates/guests/netbsd/network_static_test.rb
new file mode 100644
index 000000000..210dc4d30
--- /dev/null
+++ b/test/unit/templates/guests/netbsd/network_static_test.rb
@@ -0,0 +1,20 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/netbsd/network_static" do
+  let(:template) { "guests/netbsd/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+      ip:        "1.1.1.1",
+      netmask:   "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      ifconfig_wmen0="media autoselect up;inet 1.1.1.1 netmask 255.255.0.0"
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/redhat/network_dhcp_test.rb b/test/unit/templates/guests/redhat/network_dhcp_test.rb
new file mode 100644
index 000000000..280678a2f
--- /dev/null
+++ b/test/unit/templates/guests/redhat/network_dhcp_test.rb
@@ -0,0 +1,21 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/redhat/network_dhcp" do
+  let(:template) { "guests/redhat/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      BOOTPROTO=dhcp
+      ONBOOT=yes
+      DEVICE=ethen0
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/redhat/network_static_test.rb b/test/unit/templates/guests/redhat/network_static_test.rb
new file mode 100644
index 000000000..443ec2d56
--- /dev/null
+++ b/test/unit/templates/guests/redhat/network_static_test.rb
@@ -0,0 +1,49 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/redhat/network_static" do
+  let(:template) { "guests/redhat/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+      ip:        "1.1.1.1",
+      netmask:   "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      NM_CONTROLLED=no
+      BOOTPROTO=none
+      ONBOOT=yes
+      IPADDR=1.1.1.1
+      NETMASK=255.255.0.0
+      DEVICE=ethen0
+      PEERDNS=no
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface:  "en0",
+      ip:         "1.1.1.1",
+      gateway:    "1.2.3.4",
+      netmask:    "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      NM_CONTROLLED=no
+      BOOTPROTO=none
+      ONBOOT=yes
+      IPADDR=1.1.1.1
+      NETMASK=255.255.0.0
+      DEVICE=ethen0
+      GATEWAY=1.2.3.4
+      PEERDNS=no
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/suse/network_dhcp_test.rb b/test/unit/templates/guests/suse/network_dhcp_test.rb
new file mode 100644
index 000000000..82595db47
--- /dev/null
+++ b/test/unit/templates/guests/suse/network_dhcp_test.rb
@@ -0,0 +1,21 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/suse/network_dhcp" do
+  let(:template) { "guests/suse/network_dhcp" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      BOOTPROTO=dhcp
+      ONBOOT=yes
+      DEVICE=ethen0
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/test/unit/templates/guests/suse/network_static_test.rb b/test/unit/templates/guests/suse/network_static_test.rb
new file mode 100644
index 000000000..09117268d
--- /dev/null
+++ b/test/unit/templates/guests/suse/network_static_test.rb
@@ -0,0 +1,49 @@
+require_relative "../../../base"
+
+require "vagrant/util/template_renderer"
+
+describe "templates/guests/suse/network_static" do
+  let(:template) { "guests/suse/network_static" }
+
+  it "renders the template" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface: "en0",
+      ip:        "1.1.1.1",
+      netmask:   "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      BOOTPROTO='static'
+      IPADDR='1.1.1.1'
+      NETMASK='255.255.0.0'
+      DEVICE='ethen0'
+      PEERDNS='no'
+      STARTMODE='auto'
+      USERCONTROL='no'
+      #VAGRANT-END
+    EOH
+  end
+
+  it "includes the gateway" do
+    result = Vagrant::Util::TemplateRenderer.render(template, options: {
+      interface:  "en0",
+      ip:         "1.1.1.1",
+      gateway:    "1.2.3.4",
+      netmask:    "255.255.0.0",
+    })
+    expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
+      #VAGRANT-BEGIN
+      # The contents below are automatically generated by Vagrant. Do not modify.
+      BOOTPROTO='static'
+      IPADDR='1.1.1.1'
+      NETMASK='255.255.0.0'
+      DEVICE='ethen0'
+      GATEWAY='1.2.3.4'
+      PEERDNS='no'
+      STARTMODE='auto'
+      USERCONTROL='no'
+      #VAGRANT-END
+    EOH
+  end
+end
diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index 7f7e77d2a..d32020fa3 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -63,6 +63,9 @@ the [reserved private address space](http://en.wikipedia.org/wiki/Private_networ
 and most routers actually block traffic from going to them from the
 outside world.
 
+For some operating systems, additional configuration options for the static
+IP address are available such as setting the default gateway for mtu.
+
 ## Disable Auto-Configuration
 
 If you want to manually configure the network interface yourself, you

From 46cbd91198be5afc5b9752ed344000fc56073e32 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:35:30 -0700
Subject: [PATCH 128/165] Typo

---
 website/docs/source/v2/networking/private_network.html.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/source/v2/networking/private_network.html.md b/website/docs/source/v2/networking/private_network.html.md
index d32020fa3..bef3c5bf5 100644
--- a/website/docs/source/v2/networking/private_network.html.md
+++ b/website/docs/source/v2/networking/private_network.html.md
@@ -64,7 +64,7 @@ and most routers actually block traffic from going to them from the
 outside world.
 
 For some operating systems, additional configuration options for the static
-IP address are available such as setting the default gateway for mtu.
+IP address are available such as setting the default gateway or MTU.
 
 ## Disable Auto-Configuration
 

From 97420a04a9e85c8b6371594ff5433ad845646c81 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:36:29 -0700
Subject: [PATCH 129/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9aea9aadc..0c90b1756 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ IMPROVEMENTS:
   - core: add password authentication to rdp_info hash [GH-4726]
   - core: improve error message when packaging fails [GH-5399]
   - core: improve message when adding a box from a file path [GH-5395]
+  - core: add support for network gateways [GH-5721]
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]

From 4b07c551ac2df6313c6e470efbb617200571f67a Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 12:49:38 -0700
Subject: [PATCH 130/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c90b1756..55b7166ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ IMPROVEMENTS:
   - core: improve error message when packaging fails [GH-5399]
   - core: improve message when adding a box from a file path [GH-5395]
   - core: add support for network gateways [GH-5721]
+  - core: allow redirecting stdout and stderr in the UI [GH-5433]
   - guests/darwin: Support inserting generated key. [GH-5204]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]

From f2733ab63167dab7bf3e2ab85452b09e432043e2 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 20:44:59 -0700
Subject: [PATCH 131/165] bundler, not bundle

---
 website/docs/Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/Vagrantfile b/website/docs/Vagrantfile
index 29280239a..34e232f31 100644
--- a/website/docs/Vagrantfile
+++ b/website/docs/Vagrantfile
@@ -10,7 +10,7 @@ curl -sSL https://get.rvm.io | bash -s stable
 . ~/.bash_profile
 rvm install 2.0.0
 rvm --default use 2.0.0
-gem install bundle
+gem install bundler
 cd /vagrant
 bundle
 SCRIPT

From 710d1d97707d59d9f41e19cc49825e039c8faf97 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 20:48:33 -0700
Subject: [PATCH 132/165] Update docs for handling a list of NICs

---
 .../source/v2/networking/public_network.html.md   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/website/docs/source/v2/networking/public_network.html.md b/website/docs/source/v2/networking/public_network.html.md
index a0a29371d..e52cbaf58 100644
--- a/website/docs/source/v2/networking/public_network.html.md
+++ b/website/docs/source/v2/networking/public_network.html.md
@@ -67,13 +67,26 @@ ask you to choose which interface the virtual machine should bridge to. A defaul
 interface can be specified by adding a `:bridge` clause to the network definition.
 
 ```ruby
-config.vm.network "public_network", bridge: 'en1: Wi-Fi (AirPort)'
+config.vm.network "public_network", bridge: "en1: Wi-Fi (AirPort)"
 ```
 
 The string identifying the desired interface must exactly match the name of an
 available interface. If it can't be found, Vagrant will ask you to pick
 from a list of available network interfaces.
 
+With some providers, it is possible to specify a list of adapters to bridge
+against:
+
+```ruby
+config.vm.network "public_network", bridge: [
+  "en1: Wi-Fi (AirPort)",
+  "en6: Broadcom NetXtreme Gigabit Ethernet Controller",
+]
+```
+
+In this example, the first network adapter that exists and can successfully be
+bridge will be used.
+
 ## Disable Auto-Configuration
 
 If you want to manually configure the network interface yourself, you

From 50c0c487fb798e2f5d105bb2e65a82168b1dc3c3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 20:57:49 -0700
Subject: [PATCH 133/165] Style cleanup for new name option

---
 plugins/provisioners/shell/config.rb      | 3 ---
 plugins/provisioners/shell/provisioner.rb | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/plugins/provisioners/shell/config.rb b/plugins/provisioners/shell/config.rb
index 63f93deee..2f4957214 100644
--- a/plugins/provisioners/shell/config.rb
+++ b/plugins/provisioners/shell/config.rb
@@ -39,9 +39,6 @@ module VagrantPlugins
         if @args && args_valid?
           @args = @args.is_a?(Array) ? @args.map { |a| a.to_s } : @args.to_s
         end
-        if not(@name.nil?) and not(@name.is_a?(String))
-          @name = nil
-        end
       end
 
       def validate(machine)
diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb
index e694d1c79..4ee302f5d 100644
--- a/plugins/provisioners/shell/provisioner.rb
+++ b/plugins/provisioners/shell/provisioner.rb
@@ -65,9 +65,9 @@ module VagrantPlugins
 
             comm.upload(path.to_s, config.upload_path)
 
-            if not(config.name.nil?)
+            if config.name
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
-                                      script: "Name: #{config.name}"))
+                                      script: "script: #{config.name}"))
             elsif config.path
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
                                       script: path.to_s))
@@ -125,9 +125,9 @@ module VagrantPlugins
             command = "powershell #{shell_args.to_s} -file #{command}" if
               File.extname(exec_path).downcase == '.ps1'
 
-            if not(config.name.nil?)
+            if config.name
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.running",
-                                      script: "Name: #{config.name}"))
+                                      script: "script: #{config.name}"))
             elsif config.path
               @machine.ui.detail(I18n.t("vagrant.provisioners.shell.runningas",
                                       local: config.path.to_s, remote: exec_path))

From 3ea90b161832c8d52a4c56f5af035478a735d8a6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 20:58:16 -0700
Subject: [PATCH 134/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b7166ac..f91db5e3e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ IMPROVEMENTS:
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - provisioners/salt: provider path to missing file in errors [GH-5637]
+  - provisioners/shell: add :name attribute to shell provisioner [GH-5607]
   - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
   - providers/hyperv: allow configuring VladID [GH-5539]
   - providers/virtualbox: regexp supported for bridge configuration [GH-5320]

From 6bfee513891bf5ef12af074da13a19ebc9ea62a3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:17:28 -0700
Subject: [PATCH 135/165] Update CHANGELOG and docs for Puppet 4 environments
 support

---
 CHANGELOG.md                                  |  1 +
 .../v2/provisioning/puppet_apply.html.md      | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f91db5e3e..12a198389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ IMPROVEMENTS:
   - guests/photon: Initial support [GH-5612]
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
+  - provisioners/puppet: add support for Puppet 4 and configuration options [GH-5601]
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - provisioners/salt: provider path to missing file in errors [GH-5637]
diff --git a/website/docs/source/v2/provisioning/puppet_apply.html.md b/website/docs/source/v2/provisioning/puppet_apply.html.md
index b033bcd5e..9d9e5726d 100644
--- a/website/docs/source/v2/provisioning/puppet_apply.html.md
+++ b/website/docs/source/v2/provisioning/puppet_apply.html.md
@@ -26,6 +26,8 @@ This section lists the complete set of available options for the Puppet
 provisioner. More detailed examples of how to use the provisioner are
 available below this section.
 
+* `binary_path` (string) - Path on the guest to Puppet's `bin/` directory.
+
 * `facter` (hash) - A hash of data to set as available facter variables
   within the Puppet run.
 
@@ -43,6 +45,11 @@ available below this section.
 * `module_path` (string) - Path, on the host, to the directory which
   contains Puppet modules, if any.
 
+* `environment` (string) - Name of the Puppet environment.
+
+* `environment_path` (string) - Path to the directory that contains environment
+  files on the host disk.
+
 * `options` (array of strings) - Additionally options to pass to the
   Puppet executable when running Puppet.
 
@@ -59,6 +66,13 @@ available below this section.
   directory when Puppet is executed. This is usually only set because relative
   paths are used in the Hiera configuration.
 
+~> If only `environment` and `environments_path` are specified, it will parse
+and use the manifest specified in the `environment.conf` file. If
+`manifests_path` and `manifest_file` is specified along with the environment
+options, the manifest from the environment will be overridden by the specified `manifest_file`. If `manifests_path` and `manifest_file` are specified without
+environments, the old non-environment mode will be used (which will fail on
+Puppet 4+).
+
 ## Bare Minimum
 
 The quickest way to get started with the Puppet provisioner is to just
@@ -120,6 +134,20 @@ end
 It is a somewhat odd syntax, but the tuple (two-element array) says
 that the path is located in the "vm" at "/path/to/manifests".
 
+## Environments
+
+If you are using Puppet 4 or higher, you can also specify the name of the
+Puppet environment and the path on the local disk to the environment files:
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.provision "puppet" do |puppet|
+    puppet.environment_path = "../puppet/environments"
+    puppet.environment = "testenv"
+  end
+end
+```
+
 ## Modules
 
 Vagrant also supports provisioning with [Puppet modules](http://docs.puppetlabs.com/guides/modules.html).

From b19f5f8df74f8c9045d5f1e075a6e2f0a1cb0719 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:22:01 -0700
Subject: [PATCH 136/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12a198389..42599c93c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ IMPROVEMENTS:
   - providers/virtualbox: regexp supported for bridge configuration [GH-5320]
   - providers/virtualbox: add support for 5.0 [GH-5647]
   - providers/virtualbox: handle a list of bridged NICs [GH-5691]
+  - synced_folders/rsync: allow showing rsync output in debug mode [GH-4867]
 
 BUG FIXES:
 

From 7f716f4b63bb7054eb62c00d5a801fdc39a6327d Mon Sep 17 00:00:00 2001
From: John Cooper <john@choffee.co.uk>
Date: Wed, 11 Feb 2015 12:52:11 +0000
Subject: [PATCH 137/165] Added synced_folder_args to puppet provisioner

---
 plugins/provisioners/puppet/config/puppet.rb      | 9 +++++----
 plugins/provisioners/puppet/provisioner/puppet.rb | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/puppet/config/puppet.rb b/plugins/provisioners/puppet/config/puppet.rb
index 99b06face..9910c6e05 100644
--- a/plugins/provisioners/puppet/config/puppet.rb
+++ b/plugins/provisioners/puppet/config/puppet.rb
@@ -1,7 +1,7 @@
 module VagrantPlugins
   module Puppet
     module Config
-      class Puppet < Vagrant.plugin("2", :config)        
+      class Puppet < Vagrant.plugin("2", :config)
 
         # The path to Puppet's bin/ directory.
         # @return [String]
@@ -16,6 +16,7 @@ module VagrantPlugins
         attr_accessor :module_path
         attr_accessor :options
         attr_accessor :synced_folder_type
+        attr_accessor :synced_folder_args
         attr_accessor :temp_dir
         attr_accessor :working_directory
 
@@ -82,7 +83,7 @@ module VagrantPlugins
             @environment  = "production" if @environment == UNSET_VALUE
             if @manifests_path == UNSET_VALUE
               @manifests_path = nil
-            end            
+            end
             if @manifest_file == UNSET_VALUE
               @manifest_file = nil
             end
@@ -91,9 +92,9 @@ module VagrantPlugins
           @binary_path        = nil     if @binary_path == UNSET_VALUE
           @module_path        = nil     if @module_path == UNSET_VALUE
           @synced_folder_type = nil     if @synced_folder_type == UNSET_VALUE
+          @synced_folder_args = nil if @synced_folder_args == UNSET_VALUE
           @temp_dir           = "/tmp/vagrant-puppet" if @temp_dir == UNSET_VALUE
           @working_directory  = nil     if @working_directory == UNSET_VALUE
-
         end
 
         # Returns the module paths as an array of paths expanded relative to the
@@ -149,7 +150,7 @@ module VagrantPlugins
 
           if environment_path == nil && manifests_path == nil
               errors << "Please specify either a Puppet environment_path + environment (preferred) or manifests_path (deprecated)."
-          end          
+          end
 
           # Module paths validation
           this_expanded_module_paths.each do |path|
diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb
index 00cc1554c..36b5261f9 100644
--- a/plugins/provisioners/puppet/provisioner/puppet.rb
+++ b/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -31,6 +31,7 @@ module VagrantPlugins
           folder_opts = {}
           folder_opts[:type] = @config.synced_folder_type if @config.synced_folder_type
           folder_opts[:owner] = "root" if !@config.synced_folder_type
+          folder_opts[:args] = @config.synced_folder_args if @config.synced_folder_args
 
           if @config.environment_path.is_a?(Array)
             # Share the environments directory with the guest

From 342eb4fa36a9d6630a2ddea77d76b9d1a56c9add Mon Sep 17 00:00:00 2001
From: John Cooper <john@choffee.co.uk>
Date: Wed, 18 Feb 2015 16:11:02 +0000
Subject: [PATCH 138/165] Added doc for puppet.synced_folder_args

---
 website/docs/source/v2/provisioning/puppet_apply.html.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/website/docs/source/v2/provisioning/puppet_apply.html.md b/website/docs/source/v2/provisioning/puppet_apply.html.md
index 9d9e5726d..2d6b6af1d 100644
--- a/website/docs/source/v2/provisioning/puppet_apply.html.md
+++ b/website/docs/source/v2/provisioning/puppet_apply.html.md
@@ -58,6 +58,10 @@ available below this section.
   this will use the default synced folder type. For example, you can set this
   to "nfs" to use NFS synced folders.
 
+* `synced_folder_args` (array) - Arguments that are passed to the folder sync.
+  For example ['-a', '--delete', '--exclude=fixtures'] for the rsync sync
+  command.
+
 * `temp_dir` (string) - The directory where all the data associated with
   the Puppet run (manifest files, modules, etc.) will be stored on the
   guest machine.
@@ -65,6 +69,7 @@ available below this section.
 * `working_directory` (string) - Path in the guest that will be the working
   directory when Puppet is executed. This is usually only set because relative
   paths are used in the Hiera configuration.
+  
 
 ~> If only `environment` and `environments_path` are specified, it will parse
 and use the manifest specified in the `environment.conf` file. If

From d8285653e244e807c687f1ec3ca29a60d38fbd00 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:26:40 -0700
Subject: [PATCH 139/165] Remove extra newline

---
 website/docs/source/v2/provisioning/puppet_apply.html.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/docs/source/v2/provisioning/puppet_apply.html.md b/website/docs/source/v2/provisioning/puppet_apply.html.md
index 2d6b6af1d..89fe90195 100644
--- a/website/docs/source/v2/provisioning/puppet_apply.html.md
+++ b/website/docs/source/v2/provisioning/puppet_apply.html.md
@@ -69,7 +69,6 @@ available below this section.
 * `working_directory` (string) - Path in the guest that will be the working
   directory when Puppet is executed. This is usually only set because relative
   paths are used in the Hiera configuration.
-  
 
 ~> If only `environment` and `environments_path` are specified, it will parse
 and use the manifest specified in the `environment.conf` file. If

From d8e929cfdbfdc83c3d00781255c3467c387572c6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:27:53 -0700
Subject: [PATCH 140/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 42599c93c..422e568c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ IMPROVEMENTS:
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
   - provisioners/puppet: add support for Puppet 4 and configuration options [GH-5601]
+  - provisioners/puppet: add support for `synced_folder_args` in apply [GH-5359]
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - provisioners/salt: provider path to missing file in errors [GH-5637]

From ce8dd0c5f045e5b6b97b6b386ae68d0b38e502c5 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:32:28 -0700
Subject: [PATCH 141/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 422e568c6..b0d7f553e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ IMPROVEMENTS:
   - guests/photon: Initial support [GH-5612]
   - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
       [GH-5290]
+  - provisioners/chef: add capability for checking if Chef is installed on Windows [GH-5669]
   - provisioners/puppet: add support for Puppet 4 and configuration options [GH-5601]
   - provisioners/puppet: add support for `synced_folder_args` in apply [GH-5359]
   - provisioners/salt: add configurable `config_dir` [GH-3138]

From 8cdd6e2e1243d6f8d46bd7dbb4d9f7845e9ace34 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:35:29 -0700
Subject: [PATCH 142/165] Update CHANGELOG

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0d7f553e..940ec7992 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,12 @@ IMPROVEMENTS:
   - core: improve message when adding a box from a file path [GH-5395]
   - core: add support for network gateways [GH-5721]
   - core: allow redirecting stdout and stderr in the UI [GH-5433]
-  - guests/darwin: Support inserting generated key. [GH-5204]
+  - guests/darwin: Support inserting generated key [GH-5204]
+  - guests/darwin: Support mounting SMB shares [GH-5750]
   - guests/fedora: Support Fedora 21. [GH-5277]
   - guests/redhat: Support Scientific Linux 7 [GH-5303]
   - guests/photon: Initial support [GH-5612]
-  - guests/solaris,solaris11: Support inserting generated key. [GH-5182]
+  - guests/solaris,solaris11: Support inserting generated key [GH-5182]
       [GH-5290]
   - provisioners/chef: add capability for checking if Chef is installed on Windows [GH-5669]
   - provisioners/puppet: add support for Puppet 4 and configuration options [GH-5601]

From d62ddb30125321241fd011b73edeb3cd8c259c12 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:39:06 -0700
Subject: [PATCH 143/165] Switch back to hashicorp/precise64

---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index c9b648219..1e20fca33 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -4,7 +4,7 @@
 # Ruby, run unit tests, etc.
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "hashicorp/precise64"
   config.vm.hostname = "vagrant"
   config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'"
 

From 30308f7b5351262166b96d2b19a167b6b22910e6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:41:06 -0700
Subject: [PATCH 144/165] Update CHANGELOG

---
 CHANGELOG.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 940ec7992..ac3448cad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,12 +7,12 @@ IMPROVEMENTS:
   - core: improve message when adding a box from a file path [GH-5395]
   - core: add support for network gateways [GH-5721]
   - core: allow redirecting stdout and stderr in the UI [GH-5433]
-  - guests/darwin: Support inserting generated key [GH-5204]
-  - guests/darwin: Support mounting SMB shares [GH-5750]
-  - guests/fedora: Support Fedora 21. [GH-5277]
-  - guests/redhat: Support Scientific Linux 7 [GH-5303]
-  - guests/photon: Initial support [GH-5612]
-  - guests/solaris,solaris11: Support inserting generated key [GH-5182]
+  - guests/darwin: support inserting generated key [GH-5204]
+  - guests/darwin: support mounting SMB shares [GH-5750]
+  - guests/fedora: support Fedora 21. [GH-5277]
+  - guests/redhat: support Scientific Linux 7 [GH-5303]
+  - guests/photon: initial support [GH-5612]
+  - guests/solaris,solaris11: support inserting generated key [GH-5182]
       [GH-5290]
   - provisioners/chef: add capability for checking if Chef is installed on Windows [GH-5669]
   - provisioners/puppet: add support for Puppet 4 and configuration options [GH-5601]
@@ -37,6 +37,7 @@ BUG FIXES:
   - core: update ssh to check for Plink [GH-5604]
   - core: do not report plugins as installed when plugins are disabled [GH-5698, GH-5430]
   - core: Only take files when packaging a box to avoid duplicates [GH-5658, GH-5657]
+  - core: escape curl urls and authentication [GH-5677]
   - core/cli: fix box checksum validation [GH-4665, GH-5221]
   - core/windows: allow Windows UNC paths to allow more than 256
       characters [GH-4815]

From ebb6fa5a6f36b13e94165bd9d5c8e5573ec37d97 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 30 May 2015 21:44:57 -0700
Subject: [PATCH 145/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac3448cad..ae2a0fcd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ IMPROVEMENTS:
   - core: improve message when adding a box from a file path [GH-5395]
   - core: add support for network gateways [GH-5721]
   - core: allow redirecting stdout and stderr in the UI [GH-5433]
+  - core: update version of winrm-fs to 0.2.0 [GH-5738]
   - guests/darwin: support inserting generated key [GH-5204]
   - guests/darwin: support mounting SMB shares [GH-5750]
   - guests/fedora: support Fedora 21. [GH-5277]

From 26e399431991f749637f72915a6a5894eacbf061 Mon Sep 17 00:00:00 2001
From: Dmitry Moskalchuk <dm@crystax.net>
Date: Mon, 1 Sep 2014 13:23:37 +0400
Subject: [PATCH 146/165] Add option to enable trusted HTTP redirects

---
 lib/vagrant/action/builtin/box_add.rb         |  1 +
 lib/vagrant/action/builtin/handle_box.rb      |  2 +
 lib/vagrant/util/downloader.rb                |  2 +
 plugins/commands/box/command/add.rb           |  5 +++
 plugins/kernel_v2/config/vm.rb                | 41 ++++++++++---------
 .../v2/vagrantfile/machine_settings.html.md   |  7 ++++
 6 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/lib/vagrant/action/builtin/box_add.rb b/lib/vagrant/action/builtin/box_add.rb
index 9d308b1f8..00c88f8c8 100644
--- a/lib/vagrant/action/builtin/box_add.rb
+++ b/lib/vagrant/action/builtin/box_add.rb
@@ -404,6 +404,7 @@ module Vagrant
           downloader_options[:client_cert] = env[:box_download_client_cert]
           downloader_options[:headers] = ["Accept: application/json"] if opts[:json]
           downloader_options[:ui] = env[:ui] if opts[:ui]
+          downloader_options[:location_trusted] = env[:box_download_location_trusted]
 
           Util::Downloader.new(url, temp_path, downloader_options)
         end
diff --git a/lib/vagrant/action/builtin/handle_box.rb b/lib/vagrant/action/builtin/handle_box.rb
index 8cbdd413c..5d7f6cf68 100644
--- a/lib/vagrant/action/builtin/handle_box.rb
+++ b/lib/vagrant/action/builtin/handle_box.rb
@@ -66,6 +66,7 @@ module Vagrant
           box_download_insecure = machine.config.vm.box_download_insecure
           box_download_checksum_type = machine.config.vm.box_download_checksum_type
           box_download_checksum = machine.config.vm.box_download_checksum
+          box_download_location_trusted = machine.config.vm.box_download_location_trusted
           box_formats = machine.provider_options[:box_format] ||
             machine.provider_name
 
@@ -90,6 +91,7 @@ module Vagrant
               box_download_insecure: box_download_insecure,
               box_checksum_type: box_download_checksum_type,
               box_checksum: box_download_checksum,
+              box_download_location_trusted: box_download_location_trusted,
             }))
           rescue Errors::BoxAlreadyExists
             # Just ignore this, since it means the next part will succeed!
diff --git a/lib/vagrant/util/downloader.rb b/lib/vagrant/util/downloader.rb
index 5e52eb674..e03869351 100644
--- a/lib/vagrant/util/downloader.rb
+++ b/lib/vagrant/util/downloader.rb
@@ -49,6 +49,7 @@ module Vagrant
         @insecure    = options[:insecure]
         @ui          = options[:ui]
         @client_cert = options[:client_cert]
+        @location_trusted = options[:location_trusted]
       end
 
       # This executes the actual download, downloading the source file
@@ -224,6 +225,7 @@ module Vagrant
         options << "--insecure" if @insecure
         options << "--cert" << @client_cert if @client_cert
         options << "-u" << @auth if @auth
+        options << "--location-trusted" if @location_trusted
 
         if @headers
           Array(@headers).each do |header|
diff --git a/plugins/commands/box/command/add.rb b/plugins/commands/box/command/add.rb
index d82d441a8..114601024 100644
--- a/plugins/commands/box/command/add.rb
+++ b/plugins/commands/box/command/add.rb
@@ -38,6 +38,10 @@ module VagrantPlugins
               options[:client_cert] = c
             end
 
+            o.on("--location-trusted", "Trust 'Location' header from HTTP redirects and use the same credentials for subsequent urls as for the initial one") do |l|
+                options[:location_trusted] = l
+            end
+
             o.on("--provider PROVIDER", String, "Provider the box should satisfy") do |p|
               options[:provider] = p
             end
@@ -95,6 +99,7 @@ module VagrantPlugins
             box_download_ca_path: options[:ca_path],
             box_download_client_cert: options[:client_cert],
             box_download_insecure: options[:insecure],
+            box_download_location_trusted: options[:location_trusted],
             ui: Vagrant::UI::Prefixed.new(@env.ui, "box"),
           })
 
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 11947a30c..155a0d62f 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -27,6 +27,7 @@ module VagrantPlugins
       attr_accessor :box_download_checksum_type
       attr_accessor :box_download_client_cert
       attr_accessor :box_download_insecure
+      attr_accessor :box_download_location_trusted
       attr_accessor :communicator
       attr_accessor :graceful_halt_timeout
       attr_accessor :guest
@@ -36,25 +37,26 @@ module VagrantPlugins
       attr_reader :provisioners
 
       def initialize
-        @base_mac                     = UNSET_VALUE
-        @boot_timeout                 = UNSET_VALUE
-        @box                          = UNSET_VALUE
-        @box_check_update             = UNSET_VALUE
-        @box_download_ca_cert         = UNSET_VALUE
-        @box_download_ca_path         = UNSET_VALUE
-        @box_download_checksum        = UNSET_VALUE
-        @box_download_checksum_type   = UNSET_VALUE
-        @box_download_client_cert     = UNSET_VALUE
-        @box_download_insecure        = UNSET_VALUE
-        @box_url                      = UNSET_VALUE
-        @box_version                  = UNSET_VALUE
-        @communicator                 = UNSET_VALUE
-        @graceful_halt_timeout        = UNSET_VALUE
-        @guest                        = UNSET_VALUE
-        @hostname                     = UNSET_VALUE
-        @post_up_message              = UNSET_VALUE
-        @provisioners                 = []
-        @usable_port_range            = UNSET_VALUE
+        @base_mac                      = UNSET_VALUE
+        @boot_timeout                  = UNSET_VALUE
+        @box                           = UNSET_VALUE
+        @box_check_update              = UNSET_VALUE
+        @box_download_ca_cert          = UNSET_VALUE
+        @box_download_ca_path          = UNSET_VALUE
+        @box_download_checksum         = UNSET_VALUE
+        @box_download_checksum_type    = UNSET_VALUE
+        @box_download_client_cert      = UNSET_VALUE
+        @box_download_insecure         = UNSET_VALUE
+        @box_download_location_trusted = UNSET_VALUE
+        @box_url                       = UNSET_VALUE
+        @box_version                   = UNSET_VALUE
+        @communicator                  = UNSET_VALUE
+        @graceful_halt_timeout         = UNSET_VALUE
+        @guest                         = UNSET_VALUE
+        @hostname                      = UNSET_VALUE
+        @post_up_message               = UNSET_VALUE
+        @provisioners                  = []
+        @usable_port_range             = UNSET_VALUE
 
         # Internal state
         @__compiled_provider_configs   = {}
@@ -357,6 +359,7 @@ module VagrantPlugins
         @box_download_checksum_type = nil if @box_download_checksum_type == UNSET_VALUE
         @box_download_client_cert = nil if @box_download_client_cert == UNSET_VALUE
         @box_download_insecure = false if @box_download_insecure == UNSET_VALUE
+        @box_download_location_trusted = false if @box_download_location_trusted == UNSET_VALUE
         @box_url = nil if @box_url == UNSET_VALUE
         @box_version = nil if @box_version == UNSET_VALUE
         @communicator = nil if @communicator == UNSET_VALUE
diff --git a/website/docs/source/v2/vagrantfile/machine_settings.html.md b/website/docs/source/v2/vagrantfile/machine_settings.html.md
index 26565200e..3e68ee924 100644
--- a/website/docs/source/v2/vagrantfile/machine_settings.html.md
+++ b/website/docs/source/v2/vagrantfile/machine_settings.html.md
@@ -73,6 +73,13 @@ URL, then SSL certs will be verified.
 
 <hr>
 
+`config.vm.box_download_location_trusted` - If true, then all HTTP redirects will be
+treated as trusted. That means credentials used for initial URL will be used for
+all subsequent redirects. By default, redirect locations are untrusted so credentials
+(if specified) used only for initial HTTP request.
+
+<hr>
+
 `config.vm.box_url` - The URL that the configured box can be found at.
 If `config.vm.box` is a shorthand to a box in [HashiCorp's Atlas](https://atlas.hashicorp.com)
 then this value doesn't need to be specified. Otherwise, it should

From be2b6d620e547ce3ef1ee63955fb52826b3f1554 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 09:35:47 -0700
Subject: [PATCH 147/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae2a0fcd5..f9acda980 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ IMPROVEMENTS:
   - core: add support for network gateways [GH-5721]
   - core: allow redirecting stdout and stderr in the UI [GH-5433]
   - core: update version of winrm-fs to 0.2.0 [GH-5738]
+  - core: add option to enabled trusted http(s) redirects [GH-4422]
   - guests/darwin: support inserting generated key [GH-5204]
   - guests/darwin: support mounting SMB shares [GH-5750]
   - guests/fedora: support Fedora 21. [GH-5277]

From b90807648b31846f13760ba6b1e97f5197f25146 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 10:19:03 -0700
Subject: [PATCH 148/165] Style fixes

---
 plugins/provisioners/salt/provisioner.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/provisioners/salt/provisioner.rb b/plugins/provisioners/salt/provisioner.rb
index 4bc3f9ca6..ef179cec8 100644
--- a/plugins/provisioners/salt/provisioner.rb
+++ b/plugins/provisioners/salt/provisioner.rb
@@ -360,13 +360,13 @@ module VagrantPlugins
       end
 
       def call_orchestrate
-        if not @config.orchestrations
+        if !@config.orchestrations
           @machine.env.ui.info "orchestrate is nil. Not running state.orchestrate."
           return
         end
 
-        if not @config.install_master
-          @machine.env.ui.info "orchestrate does not make sense on a minion. Not running state.orchestrate"
+        if !@config.install_master
+          @machine.env.ui.info "orchestrate does not make sense on a minion. Not running state.orchestrate."
           return
         end
 

From e9b11b4ee4172dfaeca98492f5055d46d679ccd6 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 10:19:27 -0700
Subject: [PATCH 149/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9acda980..a87fa6b84 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ IMPROVEMENTS:
   - provisioners/salt: add configurable `config_dir` [GH-3138]
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - provisioners/salt: provider path to missing file in errors [GH-5637]
+  - provisioners/salt: add ability to run salt orchestrations [GH-4371]
   - provisioners/shell: add :name attribute to shell provisioner [GH-5607]
   - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
   - providers/hyperv: allow configuring VladID [GH-5539]

From ce13051d61e1d644c58c8246fc6b0eef8324dfe4 Mon Sep 17 00:00:00 2001
From: Adam Spiers <vagrant@adamspiers.org>
Date: Sat, 25 Oct 2014 14:01:21 +0100
Subject: [PATCH 150/165] eliminate guesswork with Vagrantfile errors

If the Vagrantfile has some kind of error, display not only
its path and the exception message, but also the originating
line number and exception class.

Also log the full backtrace when the error is in a provider
block, just as it is done when it's outside a provider block.
---
 lib/vagrant/config/loader.rb   | 2 ++
 plugins/kernel_v2/config/vm.rb | 7 +++++++
 templates/locales/en.yml       | 3 ++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/config/loader.rb b/lib/vagrant/config/loader.rb
index 35b0d0828..2ebd339a1 100644
--- a/lib/vagrant/config/loader.rb
+++ b/lib/vagrant/config/loader.rb
@@ -212,6 +212,8 @@ module Vagrant
             # Report the generic exception
             raise Errors::VagrantfileLoadError,
               path: path,
+              line: e.backtrace[0].split(':')[1],
+              exception_class: e.class,
               message: e.message
           end
         end
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 155a0d62f..ed4e750fb 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -37,6 +37,8 @@ module VagrantPlugins
       attr_reader :provisioners
 
       def initialize
+        @logger = Log4r::Logger.new("vagrant::config::vm")
+
         @base_mac                      = UNSET_VALUE
         @boot_timeout                  = UNSET_VALUE
         @box                           = UNSET_VALUE
@@ -446,8 +448,13 @@ module VagrantPlugins
               config = config.merge(new_config)
             end
           rescue Exception => e
+            @logger.error("Vagrantfile load error: #{e.message}")
+            @logger.error(e.backtrace.join("\n"))
+
             raise Vagrant::Errors::VagrantfileLoadError,
               path: "<provider config: #{name}>",
+              line: e.backtrace[0].split(':')[1],
+              exception_class: e.class,
               message: e.message
           end
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f96fb9312..acff0a687 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -1200,7 +1200,8 @@ en:
         a syntax error.
 
         Path: %{path}
-        Message: %{message}
+        Line number: %{line}
+        Message: %{exception_class}: %{message}
       vagrantfile_syntax_error: |-
         There is a syntax error in the following Vagrantfile. The syntax error
         message is reproduced below for convenience:

From 6b2ef13785d2daccd6fa427a538a5fdd48322763 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 18:32:21 -0700
Subject: [PATCH 151/165] Be more defensive when trying to get the line number

Since this is the last line of defense before raising an error, we want to make
sure we don't cause an error while trying to render the error.
---
 lib/vagrant/config/loader.rb   | 7 ++++++-
 plugins/kernel_v2/config/vm.rb | 9 ++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lib/vagrant/config/loader.rb b/lib/vagrant/config/loader.rb
index 2ebd339a1..e3f80a579 100644
--- a/lib/vagrant/config/loader.rb
+++ b/lib/vagrant/config/loader.rb
@@ -209,10 +209,15 @@ module Vagrant
             @logger.error("Vagrantfile load error: #{e.message}")
             @logger.error(e.backtrace.join("\n"))
 
+            line = "(unknown)"
+            if e.backtrace && e.backtrace[0]
+              line = e.backtrace[0].split(":")[1]
+            end
+
             # Report the generic exception
             raise Errors::VagrantfileLoadError,
               path: path,
-              line: e.backtrace[0].split(':')[1],
+              line: line,
               exception_class: e.class,
               message: e.message
           end
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index ed4e750fb..294a63e19 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -449,11 +449,18 @@ module VagrantPlugins
             end
           rescue Exception => e
             @logger.error("Vagrantfile load error: #{e.message}")
+            @logger.error(e.inspect)
+            @logger.error(e.message)
             @logger.error(e.backtrace.join("\n"))
 
+            line = "(unknown)"
+            if e.backtrace && e.backtrace[0]
+              line = e.backtrace[0].split(":")[1]
+            end
+
             raise Vagrant::Errors::VagrantfileLoadError,
               path: "<provider config: #{name}>",
-              line: e.backtrace[0].split(':')[1],
+              line: line,
               exception_class: e.class,
               message: e.message
           end

From ece8e858a6e5f1d0167ed28901f5947f452e12f4 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 18:40:05 -0700
Subject: [PATCH 152/165] Update CHANGELOG

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a87fa6b84..55fc03cf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ IMPROVEMENTS:
   - core: allow redirecting stdout and stderr in the UI [GH-5433]
   - core: update version of winrm-fs to 0.2.0 [GH-5738]
   - core: add option to enabled trusted http(s) redirects [GH-4422]
+  - core: capture additional information such as line numbers during
+    Vagrantfile loading [GH-4711, GH-5769]
   - guests/darwin: support inserting generated key [GH-5204]
   - guests/darwin: support mounting SMB shares [GH-5750]
   - guests/fedora: support Fedora 21. [GH-5277]

From efd7b459dd999ef3177cb519d6beb809bb4e4d93 Mon Sep 17 00:00:00 2001
From: langdon <langdon@fedoraproject.org>
Date: Thu, 30 Oct 2014 15:36:06 -0400
Subject: [PATCH 153/165] Add more capabilities for Fedora guests

---
 plugins/guests/fedora/cap/flavor.rb     | 25 +++++++++++++++++++++++++
 plugins/guests/fedora/cap/nfs_client.rb | 13 +++++++++++++
 plugins/guests/fedora/plugin.rb         | 10 ++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 plugins/guests/fedora/cap/flavor.rb
 create mode 100644 plugins/guests/fedora/cap/nfs_client.rb

diff --git a/plugins/guests/fedora/cap/flavor.rb b/plugins/guests/fedora/cap/flavor.rb
new file mode 100644
index 000000000..5e36fbcb5
--- /dev/null
+++ b/plugins/guests/fedora/cap/flavor.rb
@@ -0,0 +1,25 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class Flavor
+        def self.flavor(machine)
+          # Read the version file
+          output = ""
+          machine.communicate.sudo("grep VERSION_ID /etc/os-release") do |type, data|
+            output += data if type == :stdout
+          end
+          version = output.split("=")[1].chomp!.to_i
+
+          # Detect various flavors we care about
+          if version >= 20
+            return :"fedora_#{version}"
+          else if version >= 20
+            return :"fedora_#{version}"
+	  else
+            return :fedora
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/fedora/cap/nfs_client.rb b/plugins/guests/fedora/cap/nfs_client.rb
new file mode 100644
index 000000000..4c8e6a546
--- /dev/null
+++ b/plugins/guests/fedora/cap/nfs_client.rb
@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module GuestFedora
+    module Cap
+      class NFSClient
+        def self.nfs_client_install(machine)
+          machine.communicate.tap do |comm|
+            comm.sudo("yum -y install nfs-utils nfs-utils-lib")
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/plugins/guests/fedora/plugin.rb b/plugins/guests/fedora/plugin.rb
index 66b2d111f..78e376f96 100644
--- a/plugins/guests/fedora/plugin.rb
+++ b/plugins/guests/fedora/plugin.rb
@@ -25,6 +25,16 @@ module VagrantPlugins
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
+
+      guest_capability("fedora", "flavor") do
+        require_relative "cap/flavor"
+        Cap::Flavor
+      end
+
+      guest_capability("fedora", "nfs_client_install") do
+        require_relative "cap/nfs_client"
+        Cap::NFSClient
+      end
     end
   end
 end

From 3fcd3d691a9effcd54f45c65ae433d62dc271171 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 18:56:13 -0700
Subject: [PATCH 154/165] Fix syntax errors and style on Fedora flavor cap

---
 plugins/guests/fedora/cap/flavor.rb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/guests/fedora/cap/flavor.rb b/plugins/guests/fedora/cap/flavor.rb
index 5e36fbcb5..253352f5e 100644
--- a/plugins/guests/fedora/cap/flavor.rb
+++ b/plugins/guests/fedora/cap/flavor.rb
@@ -4,19 +4,18 @@ module VagrantPlugins
       class Flavor
         def self.flavor(machine)
           # Read the version file
-          output = ""
+          version = nil
           machine.communicate.sudo("grep VERSION_ID /etc/os-release") do |type, data|
-            output += data if type == :stdout
+            if type == :stdout
+              version = data.split("=")[1].chomp.to_i
+            end
           end
-          version = output.split("=")[1].chomp!.to_i
 
           # Detect various flavors we care about
-          if version >= 20
-            return :"fedora_#{version}"
-          else if version >= 20
-            return :"fedora_#{version}"
-	  else
+          if version.nil? || version < 20
             return :fedora
+          else
+            return "fedora_#{version}".to_sym
           end
         end
       end

From 30dda774548679c1e24554b3fc1aa2bdb9e352da Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 18:56:49 -0700
Subject: [PATCH 155/165] Remove unneeded tap on nfs_client cap for Fedora

---
 plugins/guests/fedora/cap/nfs_client.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/guests/fedora/cap/nfs_client.rb b/plugins/guests/fedora/cap/nfs_client.rb
index 4c8e6a546..58e084510 100644
--- a/plugins/guests/fedora/cap/nfs_client.rb
+++ b/plugins/guests/fedora/cap/nfs_client.rb
@@ -3,9 +3,7 @@ module VagrantPlugins
     module Cap
       class NFSClient
         def self.nfs_client_install(machine)
-          machine.communicate.tap do |comm|
-            comm.sudo("yum -y install nfs-utils nfs-utils-lib")
-          end
+          machine.communicate.sudo("yum -y install nfs-utils nfs-utils-lib")
         end
       end
     end

From 19f3c10777166024f12042bd4a506e609fa0ab0e Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 18:58:38 -0700
Subject: [PATCH 156/165] Always return the version

---
 plugins/guests/fedora/cap/flavor.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/guests/fedora/cap/flavor.rb b/plugins/guests/fedora/cap/flavor.rb
index 253352f5e..2a29f50b5 100644
--- a/plugins/guests/fedora/cap/flavor.rb
+++ b/plugins/guests/fedora/cap/flavor.rb
@@ -11,8 +11,7 @@ module VagrantPlugins
             end
           end
 
-          # Detect various flavors we care about
-          if version.nil? || version < 20
+          if version.nil?
             return :fedora
           else
             return "fedora_#{version}".to_sym

From 655d1adf6f71b284dc2e1c4e88e0598c1345de32 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 19:08:10 -0700
Subject: [PATCH 157/165] Update CHANGELOG

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55fc03cf3..47468b830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@ IMPROVEMENTS:
     Vagrantfile loading [GH-4711, GH-5769]
   - guests/darwin: support inserting generated key [GH-5204]
   - guests/darwin: support mounting SMB shares [GH-5750]
-  - guests/fedora: support Fedora 21. [GH-5277]
+  - guests/fedora: support Fedora 21 [GH-5277]
+  - guests/fedora: add capabilities for nfs and flavor [GH-5770, GH-4847]
   - guests/redhat: support Scientific Linux 7 [GH-5303]
   - guests/photon: initial support [GH-5612]
   - guests/solaris,solaris11: support inserting generated key [GH-5182]

From 50b78b603977abba837b9867befd8daf1b2e674c Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:09:30 -0700
Subject: [PATCH 158/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47468b830..359a21146 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ IMPROVEMENTS:
   - provisioners/salt: add support for masterless configuration [GH-3235]
   - provisioners/salt: provider path to missing file in errors [GH-5637]
   - provisioners/salt: add ability to run salt orchestrations [GH-4371]
+  - provisioners/salt: update to 2014.7.1 [GH-4152, GH-5437]
   - provisioners/shell: add :name attribute to shell provisioner [GH-5607]
   - providers/hyperv: select a Hyper-V switch based on a network_name [GH-5207]
   - providers/hyperv: allow configuring VladID [GH-5539]

From 06fe7163d2f6a8ff0d55667b323e1c9386137b65 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:11:11 -0700
Subject: [PATCH 159/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 359a21146..c64ddd474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@ BUG FIXES:
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]
   - guests/windows: Changing hostname requires reboot again since
       the non-reboot code path was crashing Windows server. [GH-5261]
+  - guests/windows: ignore virtual NICs [GH-5478]
   - hosts/windows: More accurately get host IP address in VPNs. [GH-5349]
   - plugins/login: allow users to login with a token [GH-5145]
   - providers/docker: Build image from `/var/lib/docker` for more disk

From d7283277cffe4ff2f100415855d0bd21936e5a87 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:20:15 -0700
Subject: [PATCH 160/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c64ddd474..e713af0de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ IMPROVEMENTS:
   - guests/darwin: support mounting SMB shares [GH-5750]
   - guests/fedora: support Fedora 21 [GH-5277]
   - guests/fedora: add capabilities for nfs and flavor [GH-5770, GH-4847]
+  - guests/linux: specify user's domain as separate parameter [GH-3620, GH-5512]
   - guests/redhat: support Scientific Linux 7 [GH-5303]
   - guests/photon: initial support [GH-5612]
   - guests/solaris,solaris11: support inserting generated key [GH-5182]

From 99e0cac2375441dcce7de62b2550eb77aee70205 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:32:09 -0700
Subject: [PATCH 161/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e713af0de..2db602420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -57,6 +57,7 @@ BUG FIXES:
   - guests/fedora: recognize future fedora releases [GH-5730]
   - guests/fedora: reload iface connection by NetworkManager [GH-5709]
   - guests/fedora: do not use biosdevname if it is not installed [GH-5707]
+  - guests/freebsd: provide an argument to the backup file [GH-5516, GH-5517]
   - guests/funtoo: fix incorrect path in configure networks [GH-4812]
   - guests/tinycore: fix change hostname functionality [GH-5623]
   - guests/windows: Create rsync folder prior to rsync-ing. [GH-5282]

From f1928959dc63ab2486c550f0932c36b0dda15117 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:34:57 -0700
Subject: [PATCH 162/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2db602420..bc51176cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@ BUG FIXES:
   - providers/virtualbox: Fix exception when VirtualBox version is empty. [GH-5308]
   - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
   - provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018]
+  - provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]
   - provisioners/docker: Only add docker user to group if exists. [GH-5315]
   - provisioners/docker: Use https for repo [GH-5749]
   - provisioners/chef: Use `command -v` to check for binary instead of

From f48b704ba068ea4cedeb7ae3f2df00d38c1ba0f3 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sun, 31 May 2015 20:45:37 -0700
Subject: [PATCH 163/165] Update CHANGELOG

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc51176cb..6d74712ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@ BUG FIXES:
   - provisioners/ansible: fix SSH settings to support more than 5 ssh keys [GH-5017]
   - provisioners/ansible: increase ansible connection timeout to 30 seconds [GH-5018]
   - provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]
+  - provisioners/docker: use `service` to restart Docker instad of upstart [GH-5245, GH-5577]
   - provisioners/docker: Only add docker user to group if exists. [GH-5315]
   - provisioners/docker: Use https for repo [GH-5749]
   - provisioners/chef: Use `command -v` to check for binary instead of

From f7894d9c8c83fd01a27e745a880c50023b1ab462 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Mon, 1 Jun 2015 08:36:09 +0200
Subject: [PATCH 164/165] provisioners/ansible: fix broken colorized output

After #5532 (e745436df3c64537570953d4d815eaec840da46d), it was no longer
possible to enable ansible colorized output. Even though
`ANSIBLE_NOCOLOR` has no effect *at the moment* in vagrant+ansible
integration, I agree to keep it for clarity and consistence.

The new `--no-color` behaviour (bug fix #5531) is now covered by a unit
test.

//cc @marsam, @sethvargo
---
 plugins/provisioners/ansible/provisioner.rb   |  6 +++++
 .../provisioners/ansible/provisioner_test.rb  | 27 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb
index 6b6ea2d87..b328e13d8 100644
--- a/plugins/provisioners/ansible/provisioner.rb
+++ b/plugins/provisioners/ansible/provisioner.rb
@@ -70,6 +70,12 @@ module VagrantPlugins
           # as there is no equivalent command line arguments
           "ANSIBLE_HOST_KEY_CHECKING" => "#{config.host_key_checking}",
         }
+
+        # When Ansible output is piped in Vagrant integration, its default colorization is
+        # automatically disabled and the only way to re-enable colors is to use ANSIBLE_FORCE_COLOR.
+        env["ANSIBLE_FORCE_COLOR"] = "true" if @machine.env.ui.is_a?(Vagrant::UI::Colored)
+        # Setting ANSIBLE_NOCOLOR is "unnecessary" at the moment, but this could change in the future
+        # (e.g. local provisioner [GH-2103], possible change in vagrant/ansible integration, etc.)
         env["ANSIBLE_NOCOLOR"] = "true" unless @machine.env.ui.is_a?(Vagrant::UI::Colored)
 
         # ANSIBLE_SSH_ARGS is required for Multiple SSH keys, SSH forwarding and custom SSH settings
diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 5ed6f80e5..1345033f7 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -56,6 +56,10 @@ VF
     machine.stub(ssh_info: ssh_info)
     machine.env.stub(active_machines: [[iso_env.machine_names[0], :dummy], [iso_env.machine_names[1], :dummy]])
 
+    stubbed_ui = Vagrant::UI::Colored.new
+    stubbed_ui.stub(detail: "")
+    machine.env.stub(ui: stubbed_ui)
+
     config.playbook = 'playbook.yml'
   end
 
@@ -110,7 +114,8 @@ VF
           expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o UserKnownHostsFile=/dev/null")
         end
         expect(cmd_opts[:env]['ANSIBLE_SSH_ARGS']).to include("-o IdentitiesOnly=yes")
-        expect(cmd_opts[:env]['ANSIBLE_NOCOLOR']).to eql("true")
+        expect(cmd_opts[:env]['ANSIBLE_FORCE_COLOR']).to eql("true")
+        expect(cmd_opts[:env]).to_not include("ANSIBLE_NOCOLOR")
         expect(cmd_opts[:env]['ANSIBLE_HOST_KEY_CHECKING']).to eql(expected_host_key_checking.to_s)
         expect(cmd_opts[:env]['PYTHONUNBUFFERED']).to eql(1)
       }
@@ -468,7 +473,7 @@ VF
 
       it "shows the ansible-playbook command" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} playbook.yml")
         }
       end
     end
@@ -483,7 +488,21 @@ VF
 
       it "shows the ansible-playbook command" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o IdentitiesOnly=yes -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/path/to/my/key --user=testuser --connection=ssh --timeout=30 --limit='machine1' --inventory-file=#{generated_inventory_dir} -v playbook.yml")
+        }
+      end
+    end
+
+    describe "without colorized output" do
+      before do
+        machine.env.stub(ui: Vagrant::UI::Basic.new)
+      end
+
+      it "disables ansible-playbook colored output" do
+        expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
+          cmd_opts = args.last
+          expect(cmd_opts[:env]).to_not include("ANSIBLE_FORCE_COLOR")
+          expect(cmd_opts[:env]['ANSIBLE_NOCOLOR']).to eql("true")
         }
       end
     end
@@ -541,7 +560,7 @@ VF
 
       it "shows the ansible-playbook command, with additional quotes when required" do
         expect(machine.env.ui).to receive(:detail).with { |full_command|
-          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_NOCOLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/my/key1 --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' playbook.yml")
+          expect(full_command).to eq("PYTHONUNBUFFERED=1 ANSIBLE_HOST_KEY_CHECKING=true ANSIBLE_FORCE_COLOR=true ANSIBLE_SSH_ARGS='-o IdentitiesOnly=yes -o IdentityFile=/my/key2 -o ForwardAgent=yes -o ControlMaster=no -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook --private-key=/my/key1 --user=testuser --connection=ssh --timeout=30 --limit='machine*:&vagrant:!that_one' --inventory-file=#{generated_inventory_dir} --extra-vars=@#{File.expand_path(__FILE__)} --sudo --sudo-user=deployer -vvv --ask-sudo-pass --ask-vault-pass --vault-password-file=#{File.expand_path(__FILE__)} --tags=db,www --skip-tags=foo,bar --start-at-task='an awesome task' --why-not --su-user=foot --ask-su-pass --limit='all' playbook.yml")
         }
       end
     end

From 272fb27e05368cc278f11aeb99e52e2101be59e2 Mon Sep 17 00:00:00 2001
From: Gilles Cornu <git@gilles.cornu.name>
Date: Fri, 29 May 2015 10:36:17 +0200
Subject: [PATCH 165/165] provisioners/ansible: trim white spaces

[ci skip]
---
 test/unit/plugins/provisioners/ansible/provisioner_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
index 1345033f7..ca9a891c8 100644
--- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb
+++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb
@@ -570,7 +570,7 @@ VF
     #
 
     context "with Docker provider on a non-Linux host" do
-      
+
       let(:fake_host_ssh_info) {{
         private_key_path: ['/path/to/docker/host/key'],
         username: 'boot9docker',
@@ -580,7 +580,7 @@ VF
       let(:fake_host_vm) {
         double("host_vm").tap do |h|
           h.stub(ssh_info: fake_host_ssh_info)
-        end      
+        end
       }
 
       before do