diff options
author | Nick Lewis <nick@puppetlabs.com> | 2011-05-26 13:51:56 -0700 |
---|---|---|
committer | Nick Lewis <nick@puppetlabs.com> | 2011-05-26 13:51:56 -0700 |
commit | 2ebd2d9eda3c556244cda1ae62da95965a92d79b (patch) | |
tree | ce999b3219533d12cd0d182c2fef5ea1c68f2ed2 /lib/puppet | |
parent | 76ad2bb2ea14a915344acd19da2c8a1edb3067b0 (diff) | |
parent | 163ff6b39120815d52811b20ef5f7f46f2fd950f (diff) | |
download | puppet-2ebd2d9eda3c556244cda1ae62da95965a92d79b.tar.gz puppet-2ebd2d9eda3c556244cda1ae62da95965a92d79b.tar.xz puppet-2ebd2d9eda3c556244cda1ae62da95965a92d79b.zip |
Merge branch 'ticket/2.7rc/7681' into 2.7rc
Diffstat (limited to 'lib/puppet')
-rw-r--r-- | lib/puppet/parser/ast/resource_reference.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/ast/resource_reference.rb b/lib/puppet/parser/ast/resource_reference.rb index 0f8e655bf..256a99d75 100644 --- a/lib/puppet/parser/ast/resource_reference.rb +++ b/lib/puppet/parser/ast/resource_reference.rb @@ -7,7 +7,7 @@ class Puppet::Parser::AST::ResourceReference < Puppet::Parser::AST::Branch # Evaluate our object, but just return a simple array of the type # and name. def evaluate(scope) - titles = Array(title.safeevaluate(scope)) + titles = Array(title.safeevaluate(scope)).flatten a_type, titles = scope.resolve_type_and_titles(type, titles) |