diff options
| author | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
| commit | fe157f239a301abb52f81c62719355c8e50c970c (patch) | |
| tree | 2ff683d14dbf5c95a99410fe1d12300368cf497e /lib/puppet/parser/functions.rb | |
| parent | 3cb0d60d3d0870f1d9ac83e5dbeaa06d2888231f (diff) | |
| parent | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (diff) | |
| download | puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.gz puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.xz puppet-fe157f239a301abb52f81c62719355c8e50c970c.zip | |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
spec/integration/defaults.rb
spec/integration/node/catalog.rb
spec/unit/rails.rb
spec/unit/type/mount.rb
Diffstat (limited to 'lib/puppet/parser/functions.rb')
| -rw-r--r-- | lib/puppet/parser/functions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb index e0b60e161..93991275c 100644 --- a/lib/puppet/parser/functions.rb +++ b/lib/puppet/parser/functions.rb @@ -165,7 +165,7 @@ module Functions type is defined, either as a native type or a defined type, or whether a class is defined. This is useful for checking whether a class is defined and only including it if it is. This function can also test whether a resource has been defined, using resource references - (e.g., ``if defined(File['/tmp/myfile'] { ... }``). This function is unfortunately + (e.g., ``if defined(File['/tmp/myfile']) { ... }``). This function is unfortunately dependent on the parse order of the configuration when testing whether a resource is defined.") do |vals| result = false vals.each do |val| |