A whole bunch of missing changes!

4 files changed, 8 insertions, 8 deletions

diff --git a/lib/chef/mixin/command.rb b/lib/chef/mixin/command.rb
index 85e3c466eb..08344148a5 100644
--- a/lib/chef/mixin/command.rb
+++ b/lib/chef/mixin/command.rb
@@ -41,10 +41,10 @@ class Chef
           end
         end
         
-        if args.has_key?(:unless)
-          status = popen4(args[:unless]) { |p, i, o, e| }
+        if args.has_key?(:not_if)
+          status = popen4(args[:not_if]) { |p, i, o, e| }
           if status.exitstatus == 0
-            Chef::Log.debug("Skipping #{args[:command_string]} - unless #{args[:unless]} returned #{status.exitstatus}")
+            Chef::Log.debug("Skipping #{args[:command_string]} - unless #{args[:not_if]} returned #{status.exitstatus}")
             return false
           end
         end
diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb
index 82603fe370..67a706e4f1 100644
--- a/lib/chef/provider/execute.rb
+++ b/lib/chef/provider/execute.rb
@@ -35,7 +35,7 @@ class Chef
         }
         command_args[:creates] = @new_resource.creates if @new_resource.creates
         command_args[:onlyif] = @new_resource.onlyif if @new_resource.onlyif
-        command_args[:unless] = @new_resource.unless if @new_resource.unless
+        command_args[:not_if] = @new_resource.not_if if @new_resource.not_if
         command_args[:timeout] = @new_resource.timeout if @new_resource.timeout
         command_args[:returns] = @new_resource.returns if @new_resource.returns
         command_args[:environment] = @new_resource.environment if @new_resource.environment
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index 21f08e2a34..232cfe4d64 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -35,7 +35,7 @@ class Chef
         @notify_only = false
         @returns = 0
         @timeout = nil
-        @unless = nil
+        @not_if = nil
         @user = nil
         @allowed_actions.push(:run)
       end
@@ -112,9 +112,9 @@ class Chef
         )
       end
 
-      def unless(arg=nil)
+      def not_if(arg=nil)
         set_or_return(
-          :unless,
+          :not_if,
           arg,
           :kind_of => [ String ]
         )
diff --git a/lib/chef_server/controllers/openid_register.rb b/lib/chef_server/controllers/openid_register.rb
index 34851bc517..f5113ef267 100644
--- a/lib/chef_server/controllers/openid_register.rb
+++ b/lib/chef_server/controllers/openid_register.rb
@@ -25,7 +25,7 @@ class OpenidRegister < Application
   before :fix_up_node_id
 
   def index
-    @headers['X-XRDS-Location'] = absolute_url(:controller => "openid_server", :action => "idp_xrds")
+    @headers['X-XRDS-Location'] = absolute_url(:protocol => "http", :controller => "openid_server", :action => "idp_xrds")
     @registered_nodes = Chef::OpenIDRegistration.list(true)
     Chef::Log.debug(@registered_nodes.inspect)
     display @registered_nodes