Merge branch 'skeptomai/chef-54a' of git@github.com:adamhjk/chef into skeptomai/chef-54a

Conflicts:

	chef-server/config/dependencies.rb

Author: adamhjk

.gitignore

@@ -8,6 +8,7 @@ examples/openid-cstore
 examples/openid-db
 chef/pkg
 chef-server/pkg
+chef-server-slice/pkg
 chef/log
 chef-server/log
 log

chef-server/config/database.yml

@@ -1,19 +1,10 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "1.0.9"
-dm_gems_version   = "0.9.10"
-do_gems_version   = "0.9.11"
 
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 
-dependency "merb-action-args", merb_gems_version
 dependency "merb-assets", merb_gems_version  
-dependency("merb-cache", merb_gems_version) do
-  Merb::Cache.setup do
-    register(Merb::Cache::FileStore) unless Merb.cache
-  end
-end
 dependency "merb-helpers", merb_gems_version 
 dependency "merb-slices", merb_gems_version  
 dependency "merb-exceptions", merb_gems_version
-
 dependency "chef-server-slice"

chef-server/config/dependencies.rb

@@ -3,7 +3,6 @@
 require 'config/dependencies.rb'
 require 'chef'
 
-use_orm :datamapper
 use_test :rspec
 use_template_engine :haml