| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
