Merge branch 'develop'

jrwesolo · Apr 10, 2014 · 33335bd · 33335bd
2 parents 0473110 + f8eb0d9
commit 33335bd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libraries/default.rb b/libraries/default.rb
@@ -1,4 +1,4 @@
-def validate_limits(limits = [], validate = true)
+def validate_limits(limits = [])
   valid = []
   invalid = []
 

diff --git a/templates/default/limits.d.conf.erb b/templates/default/limits.d.conf.erb
@@ -1,7 +1,7 @@
 # Generated by Chef for <%= node['fqdn'] %>
 # Local modifications will be overwritten.
 
-<% if !@invalid_limits.empty? %>
+<% if !@valid_limits.empty? %>
 <% @valid_limits.each do |limit| %>
 <%= limit %>
 <% end %>