diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-04-13 15:51:43 -0700 |
| commit | 02691637553d5637ee01a433a516b5d8cc9768a9 (patch) | |
| tree | 9465b1ed4dcb64f68e6137be5ea094e8d305f5e9 /lib/puppet/node | |
| parent | 008770dba7946b67f252561fecd967c7fe67fd17 (diff) | |
| parent | 24a277c5e805ce16e0b86e17e6cb2fbe1945ae07 (diff) | |
| download | puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.gz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.tar.xz puppet-02691637553d5637ee01a433a516b5d8cc9768a9.zip | |
Merge branch 'ticket/next/6928' into next
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/environment.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index dc631979e..4589ea64c 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -150,7 +150,6 @@ class Puppet::Node::Environment private def perform_initial_import - return empty_parse_result if Puppet.settings[:ignoreimport] parser = Puppet::Parser::Parser.new(self) if code = Puppet.settings.uninterpolated_value(:code, name.to_s) and code != "" parser.string = code |