Repository navigation
Commit 1774b48
committed
Merge branch '0.8-alpha' of git@github.com:opscode/chef into 0.8-alpha-wtf
Conflicts:
chef-server-webui/app/views/cookbook_templates/index.html.haml
chef-server-webui/app/views/cookbooks/show.html.haml
chef-server-webui/app/views/openid_login/index.html.haml
chef-server-webui/app/views/openid_server/decide.html.haml
chef/lib/chef/client.rb
chef/lib/chef/compile.rb
chef/lib/chef/node/attribute.rb
chef/lib/chef/rest.rb
chef/spec/unit/client_spec.rb
chef/spec/unit/couchdb_spec.rb
chef/spec/unit/node/attribute_spec.rb7 files changed
Lines changed: 3 additions & 40 deletions
File tree
- chef-server-webui/app/views
- cookbook_templates
- cookbooks
- openid_login
- openid_server
- chef
- lib/chef
- node
- spec/unit/node
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
| 40 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
382 | 382 | | |
383 | 383 | | |
384 | 384 | | |
385 | | - | |
386 | | - | |
387 | 385 | | |
388 | 386 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
216 | 216 | | |
217 | 217 | | |
218 | 218 | | |
219 | | - | |
220 | 219 | | |
221 | 220 | | |
222 | 221 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
477 | 477 | | |
478 | 478 | | |
479 | 479 | | |
480 | | - | |
| 480 | + | |
481 | 481 | | |
482 | 482 | | |
483 | 483 | | |
| |||
0 commit comments