Skip to content

Commit 1774b48

Browse files
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.rb
2 parents 6bbb168 + 55877d1 commit 1774b48

7 files changed

Lines changed: 3 additions & 40 deletions

File tree

‎chef-server-webui/app/views/cookbook_templates/index.html.haml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎chef-server-webui/app/views/cookbooks/show.html.haml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@
3737
- @cookbook.template_files.each do |f|
3838
.code
3939
%h4.head= link_to File.basename(f), "#"
40-
%pre.ruby= syntax_highlight(f)
40+
%pre.ruby= syntax_highlight(f)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#login-form
2-
%form{ :method => "get", :action => slice_url(:openid_login_submit) }
2+
%form{ :method => "get", :action => url(:openid_login_submit) }
33
%input{ :type => "text", :name => "username" }/
44
%input{ :type => "submit", :value => "Log In"}/
55

‎chef-server-webui/app/views/openid_server/decide.html.haml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎chef/lib/chef/node/attribute.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,5 @@ def method_missing(symbol, *args)
382382
self[by]
383383
end
384384
end
385-
386-
387385
end
388386
end

‎chef/lib/chef/rest.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ def run_request(method, url, headers={}, data=false, limit=10, raw=false)
216216
# Optionally handle HTTP Basic Authentication
217217
req.basic_auth(url.user, url.password) if url.user
218218

219-
Chef::Log.debug("Sending HTTP Request via #{req.method} to #{req.path}")
220219
res = nil
221220
tf = nil
222221
http_retries = 1

‎chef/spec/unit/node/attribute_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
{
478478
"one" => { "two" => "three" },
479479
"hut" => { "two" => "three" },
480-
"place" => { },
480+
"place" => { }
481481
},
482482
{
483483
"one" => { "four" => "five" },

0 commit comments

Comments
 (0)