diff options
| author | Adam Jacob <adam@opscode.com> | 2009-08-01 21:26:21 -0700 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2009-08-20 13:31:58 -0700 |
| commit | 89779a4d487ac7dd313e16eb68732835bd13d4e4 (patch) | |
| tree | d8b867f3a5610ed39bd864149152085af05a1c3d /.gitignore | |
| parent | 89a2609242a63d6bc85e0ddfed078319b4d4a81b (diff) | |
| download | chef-89779a4d487ac7dd313e16eb68732835bd13d4e4.tar.gz | |
Initial pass at a Chef 0.8.0 alpha
Conflicts:
Rakefile
chef-server-slice/Rakefile
chef-server-slice/app/controllers/application.rb
chef-server-slice/app/controllers/exceptions.rb
chef-server-slice/app/controllers/nodes.rb
chef-server-slice/app/controllers/openid_consumer.rb
chef-server-slice/app/controllers/openid_server.rb
chef-server-slice/app/helpers/nodes_helper.rb
chef-server/Rakefile
chef-server/config/dependencies.rb
chef-server/config/init.rb
chef/Rakefile
chef/lib/chef.rb
chef/lib/chef/application/indexer.rb
chef/lib/chef/client.rb
chef/lib/chef/config.rb
chef/lib/chef/node.rb
chef/lib/chef/queue.rb
chef/spec/unit/application/indexer_spec.rb
chef/spec/unit/client_spec.rb
chef/spec/unit/config_spec.rb
cucumber.yml
features/api/nodes/create_node_api.feature
features/api/nodes/delete_node_api.feature
features/api/nodes/list_nodes_api.feature
features/api/nodes/show_node_api.feature
features/api/nodes/update_node_api.feature
features/api/roles/list_roles_api.feature
features/steps/fixture_steps.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ee6b386eef..9401920165 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,8 @@ examples/openid-cstore examples/openid-db chef/pkg chef-server/pkg -chef-server-slice/pkg +chef-server-webui/pkg +chef-server-api/pkg chef/log chef-server/log log @@ -18,3 +19,5 @@ couchdb.stdout features/data/tmp/** *.swp features/data/cookbooks/**/metadata.json +features/data/solr/** +erl_crash.dump |