Merge remote-tracking branch 'github/pull/122'

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

diff --git a/cookbooks/chef/attributes/default.rb b/cookbooks/chef/attributes/default.rb
index df0981cf6106b7c4d1c7233f01f5164153cee1de..06db9bf6d6b98ab19b73522299c4f3cc3ba9aebf 100644 (file)
--- a/cookbooks/chef/attributes/default.rb
+++ b/cookbooks/chef/attributes/default.rb
@@ -1,11 +1,8 @@
 # Add the opscode APT source for chef
 # Add the opscode APT source for chef

-default[:apt][:sources] = node[:apt][:sources] | [ "opscode" ]
+default[:apt][:sources] = node[:apt][:sources] | ["opscode"]

 
 # Set the default server version
 
 # Set the default server version

-default[:chef][:server][:version] = "11.1.3-1"
+default[:chef][:server][:version] = "12.13.0-1"

 
 # Set the default client version
 
 # Set the default client version

-default[:chef][:client][:version] = "11.16.2-1"
-
-# A list of gems needed by chef recipes
-default[:chef][:gems] = []
+default[:chef][:client][:version] = "12.20.3"