From 070f20dad701bd7f1cf48684413bde5b137a2cc8 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sat, 30 Jul 2011 10:28:38 -0700 Subject: [PATCH] Get rid of chef json "merge" in default Vagrantfile --- templates/commands/init/Vagrantfile.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/commands/init/Vagrantfile.erb b/templates/commands/init/Vagrantfile.erb index 2b1c58f5a..9f54d7fff 100644 --- a/templates/commands/init/Vagrantfile.erb +++ b/templates/commands/init/Vagrantfile.erb @@ -58,7 +58,7 @@ Vagrant::Config.run do |config| # chef.add_role "web" # # # You may also specify custom JSON attributes: - # chef.json.merge!({ :mysql_password => "foo" }) + # chef.json = { :mysql_password => "foo" } # end # Enable provisioning with chef server, specifying the chef server URL,