summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorAdam Jacob <adam@opscode.com>2009-05-19 15:51:01 -0700
committerAdam Jacob <adam@opscode.com>2009-05-19 15:51:01 -0700
commit97688bb44b86d8b5c5271de34ffaf815dc43cff3 (patch)
tree26cc9e29573002224d69eb8eb4d22255ad085ee0 /Rakefile
parent8cb7a9fc334023172e7b6d98b828e1df77c7e0bd (diff)
parentffc9ed925661ff2906b9e0f0f2784dbd631fce09 (diff)
downloadchef-97688bb44b86d8b5c5271de34ffaf815dc43cff3.tar.gz
Merge branch 'master' into chef-284
Conflicts: chef-server-slice/config/init.rb
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Rakefile b/Rakefile
index ad17b589a0..0d425c2147 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,6 +30,8 @@ task :spec do
end
end
+task :default => :spec
+
def start_dev_environment(type="normal")
@couchdb_server_pid = nil
@chef_server_pid = nil