Merge remote-tracking branch 'github/pull/349' into master

[chef.git] / cookbooks / chef / attributes / default.rb

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index 3a14f0f82acf45227aee354f399f0a76efcf28c0..d8ef595999581058af9630e5fdb526d4ae9464fa 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -1,8 +1,8 @@
 # Add the opscode APT source for chef
-default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ]
+default[:apt][:sources] = node[:apt][:sources] | ["opscode"]
 
-# Set the default client version
-default[:chef][:client][:version] = "11.10.2-1"
+# Set the default server version
+default[:chef][:server][:version] = "12.17.33"
 
-# A list of gems needed by chef recipes
-default[:chef][:gems] = []
+# Set the default client version
+default[:chef][:client][:version] = "16.6.14"