Merge branch 'master' of git@github.com:ezmobius/chef

Author: adamhjk

chef-server/bin/chef-server

@@ -43,6 +43,4 @@ else
   )
 end
 
-Chef::Config.from_file(File.join("/etc/", "chef", "server.rb"))
-
 Merb.start

chef-server/lib/init.rb

@@ -117,7 +117,6 @@
 Merb.push_path(:public, File.join(File.dirname(__FILE__), "public"))
 
 require 'merb-haml'
-require 'uv'
 
 
 #

chef/lib/chef/resource/execute.rb

@@ -82,11 +82,11 @@ def group(arg=nil)
 
       def only_if(arg=nil, &blk)
         if Kernel.block_given?
-          @not_if = blk
+          @only_if = blk
         else
-          @not_if = arg if arg
+          @only_if = arg if arg
         end
-        @not_if
+        @only_if
       end
 
       def path(arg=nil)

chef/lib/chef/rest.rb

@@ -130,6 +130,8 @@ def run_request(method, url, data=false, limit=10, raw=false)
             size += chunk.size
             if size == 0
               Chef::Log.debug("#{req.path} done (0 length file)")
+            elsif total == 0
+              Chef::Log.debug("#{req.path} (zero content length)")
             else
               Chef::Log.debug("#{req.path} %d%% done (%d of %d)" % [(size * 100) / total, size, total])
             end