From 171b7c76d76f24a11eb23d32f73b012cf728f977 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 10 Mar 2014 13:43:57 -0700 Subject: [PATCH] kernel/v1: provisioner upgrade works properly [GH-3092] --- CHANGELOG.md | 2 ++ plugins/kernel_v1/config/vm.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23c53b92e..0314c049f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 1.5.1 (unreleased) +BUG FIXES: + - core: V1 Vagrantfiles can upgrade provisioners properly. [GH-3092] ## 1.5.0 (March 10, 2014) diff --git a/plugins/kernel_v1/config/vm.rb b/plugins/kernel_v1/config/vm.rb index 239afa219..d64bbbd79 100644 --- a/plugins/kernel_v1/config/vm.rb +++ b/plugins/kernel_v1/config/vm.rb @@ -146,7 +146,8 @@ module VagrantPlugins # Provisioners self.provisioners.each do |name, options, block| - new.vm.provision(name, options, &block) + options ||= {} + new.vm.provision(name, **options, &block) end # Shared folders