Merge branch 'master' of git@github.com:opscode/chef into 0712-merge

Conflicts:

	Rakefile
	chef-server-slice/Rakefile
	chef-server-slice/app/controllers/application.rb
	chef-server-slice/app/controllers/cookbooks.rb
	chef-server-slice/app/views/cookbooks/show.html.haml
	chef-server-slice/lib/chef-server-slice.rb
	chef-server/Rakefile
	chef/Rakefile
	chef/lib/chef.rb
	chef/lib/chef/client.rb
	chef/lib/chef/cookbook.rb
	chef/spec/unit/client_spec.rb
	cucumber.yml

1 files changed, 9 insertions, 0 deletions

diff --git a/Rakefile b/Rakefile
index 31d80fbfbd..032fdcf8de 100644
--- a/Rakefile
+++ b/Rakefile
@@ -332,12 +332,17 @@ namespace :features do
       t.profile = "recipe_inclusion"
     end
   end
+  
+  Cucumber::Rake::Task.new(:lwrp) do |t|
+    t.profile = "lwrp"
+  end
 
   desc "Run cucumber tests for providers" 
   Cucumber::Rake::Task.new(:provider) do |t|
     t.profile = "provider"
   end
 
+  
   namespace :provider do
     desc "Run cucumber tests for directory resources"
     Cucumber::Rake::Task.new(:directory) do |t|
@@ -364,6 +369,10 @@ namespace :features do
       t.profile = "provider_template"
     end
     
+    Cucumber::Rake::Task.new(:git) do |t|
+      t.profile = "provider_git"
+    end
+    
     namespace :package do
       desc "Run cucumber tests for macports packages"
       Cucumber::Rake::Task.new(:macports) do |t|