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

Conflicts:

	Rakefile
	chef-server-slice/Rakefile
	chef-server/Rakefile
	chef/Rakefile
	chef/lib/chef.rb
	chef/lib/chef/config.rb
	chef/lib/chef/couchdb.rb
	chef/lib/chef/node/attribute.rb
	cucumber.yml

1 files changed, 6 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index c8f5667668..301c4d08c2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -344,7 +344,7 @@ namespace :features do
     end
 
     desc "Run cucumber tests for file resources"
-    Cucumber::Rake::Task.new(:execute) do |t|
+    Cucumber::Rake::Task.new(:file) do |t|
       t.profile = "provider_file"
     end
 
@@ -352,6 +352,11 @@ namespace :features do
     Cucumber::Rake::Task.new(:remote_file) do |t|
       t.profile = "provider_remote_file"
     end
+
+    desc "Run cucumber tests for template resources"
+    Cucumber::Rake::Task.new(:template) do |t|
+      t.profile = "provider_template"
+    end
     
     namespace :package do
       desc "Run cucumber tests for macports packages"