Merge branch 'master' into 0.8-alpha

All tests pass.

Conflicts:

	chef-server-slice/Rakefile
	chef-server/Rakefile
	chef/Rakefile
	chef/lib/chef.rb
	chef/lib/chef/provider/cron.rb
	chef/lib/chef/provider/service/freebsd.rb
	chef/lib/chef/provider/service/simple.rb
	chef/spec/unit/provider/deploy_spec.rb
	cucumber.yml
	features/support/env.rb

1 files changed, 8 insertions, 0 deletions

diff --git a/Rakefile b/Rakefile
index 3f4ff1ce2e..e6030df651 100644
--- a/Rakefile
+++ b/Rakefile
@@ -306,6 +306,10 @@ namespace :features do
     Cucumber::Rake::Task.new(:roles) do |t|
       t.profile = "client_roles"
     end
+
+    Cucumber::Rake::Task.new(:run_interval) do |t|
+      t.profile = "client_run_interval"
+    end
   end
 
   desc "Run cucumber tests for the cookbooks"
@@ -383,6 +387,10 @@ namespace :features do
       Cucumber::Rake::Task.new(:macports) do |t|
         t.profile = "provider_package_macports"
       end
+      
+      Cucumber::Rake::Task.new(:gems) do |g|
+        g.profile = "provider_package_rubygems"
+      end
     end
   end
 end