Merge branch 'COOK-532'

pauldowman · May 3, 2011 · 61c57f6 · 61c57f6
2 parents ef9720d + 0abd990
commit 61c57f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/recipes/django.rb b/application/recipes/django.rb
@@ -116,7 +116,7 @@
 
   # we need the django version to render the correct type of settings.py file
   django_version = 1.2
-  if app['pips'].has_key?('django') && !app['pips']['django'].blank?
+  if app['pips'].has_key?('django') && !app['pips']['django'].strip.empty?
     django_version = app['pips']['django'].to_f
   end
 

diff --git a/riak/providers/cluster.rb b/riak/providers/cluster.rb
@@ -23,7 +23,7 @@
 include Timeout
 
 def load_current_resource
-  Chef::Application.fatal!("Can't join a Riak cluster without cluster_members.") if Chef::Config[:solo] && new_resource.cluster_members.blank?  
+  Chef::Application.fatal!("Can't join a Riak cluster without cluster_members.") if Chef::Config[:solo] && new_resource.cluster_members.empty?
   @current_resource ||= Chef::Resource::RiakCluster.new(new_resource.cluster_name)
   current_resource.ring_ready(ringready)
   Chef::Application.fatal!("Can't join a Riak cluster if the local node is not running.") unless current_resource.ring_ready[:running]