From 7f025fd164109b9bac43bb9c9d1ddfb2f4ee2996 Mon Sep 17 00:00:00 2001
From: Francois Deppierraz <francois@ctrlaltdel.ch>
Date: Tue, 2 Apr 2013 11:11:36 +0200
Subject: [PATCH] Fix syntax error in Vagrantfile

The error was only triggered in verbose mode.
---
 Vagrantfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 69b9d6d..f762a6e 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -183,7 +183,7 @@ Vagrant::Config.run do |config|
       end
 
       puppet_options = ["--certname=#{node_name}"]
-      puppet_options.merge!({'--verbose', '--show_diff'}) if v_config['verbose']
+      puppet_options.merge!(['--verbose', '--show_diff']) if v_config['verbose']
 
       # configure hosts, install hiera
       # perform pre-steps that always need to occur