Merge pull request #23137 from sondabar/master

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-18 04:47:31 -07:00
commit d2fe575218
1 changed files with 3 additions and 0 deletions

3
Vagrantfile vendored
View File

@ -186,6 +186,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
v.customize ['set', :id, '--shf-guest-automount', 'off']
v.customize ['set', :id, '--shf-host', 'on']
# Synchronize VM clocks to host clock (Avoid certificate invalid issue)
v.customize ['set', :id, '--time-sync', 'on']
# Remove all auto-mounted "shared folders"; the result seems to
# persist between runs (i.e., vagrant halt && vagrant up)
override.vm.provision :shell, :inline => (%q{