diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-05-26 14:05:13 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-05-26 14:05:13 -0700 |
| commit | 59e6be30f24dfb1011fbb242029b5ff61e19514c (patch) | |
| tree | 0a1c23a95e4e2922d08a7dfdeaeaf39f968adbae /lib/puppet/parser | |
| parent | 996dc076e9ca61613f80fc79f0ffe667b14d1ebb (diff) | |
| parent | 2ebd2d9eda3c556244cda1ae62da95965a92d79b (diff) | |
| download | puppet-59e6be30f24dfb1011fbb242029b5ff61e19514c.tar.gz puppet-59e6be30f24dfb1011fbb242029b5ff61e19514c.tar.xz puppet-59e6be30f24dfb1011fbb242029b5ff61e19514c.zip | |
Merge branch '2.7rc' into 2.7.x
Diffstat (limited to 'lib/puppet/parser')
| -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) |