diff options
| author | Adam Jacob <adam@opscode.com> | 2010-03-04 16:11:44 -0800 |
|---|---|---|
| committer | Adam Jacob <adam@opscode.com> | 2010-03-04 16:11:44 -0800 |
| commit | 791896d3831efb39d43a180bb44961babdc8a77d (patch) | |
| tree | fbc50601c61ebed842aae9e3e54218cf5ef0a956 | |
| parent | cb037d7e251a743db4e4c0f873d87e9dc127dcba (diff) | |
| parent | d0c92e22e92dee2e3e0854224c58ecdc0012cdfc (diff) | |
| download | chef-791896d3831efb39d43a180bb44961babdc8a77d.tar.gz | |
Merge branch 'CHEF-1000' of git://github.com/nuoyan/chef into nuoyan/CHEF-1000
| -rw-r--r-- | chef/lib/chef/run_list.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chef/lib/chef/run_list.rb b/chef/lib/chef/run_list.rb index 22d6b56dd9..a619304235 100644 --- a/chef/lib/chef/run_list.rb +++ b/chef/lib/chef/run_list.rb @@ -142,7 +142,7 @@ class Chef role = Chef::Role.cdb_load(name, couchdb) end @seen_roles << name - rec, d, o = role.run_list.expand(from) + rec, d, o = role.run_list.expand(from, couchdb) rec.each { |r| recipes << r unless recipes.include?(r) } default_attrs = Chef::Mixin::DeepMerge.merge(default_attrs, Chef::Mixin::DeepMerge.merge(role.default_attributes,d)) override_attrs = Chef::Mixin::DeepMerge.merge(override_attrs, Chef::Mixin::DeepMerge.merge(role.override_attributes, o)) |