diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-10-01 11:35:35 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-10-01 11:35:35 -0700 |
| commit | da84c03a7d1fe33c660c3e4c3a069ef1aed23bae (patch) | |
| tree | a75697d977d90b7754e0a14dcfc13b33aff893d1 /lib/puppet/parser/functions | |
| parent | 0077379e528037d875a92575a994d01ca5233cc0 (diff) | |
| parent | 917c520f1abc0c72d7065531cffcef88259e32e0 (diff) | |
| download | puppet-da84c03a7d1fe33c660c3e4c3a069ef1aed23bae.tar.gz puppet-da84c03a7d1fe33c660c3e4c3a069ef1aed23bae.tar.xz puppet-da84c03a7d1fe33c660c3e4c3a069ef1aed23bae.zip | |
Merge commit '2.6.2rc1'
Diffstat (limited to 'lib/puppet/parser/functions')
| -rw-r--r-- | lib/puppet/parser/functions/extlookup.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/parser/functions/versioncmp.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/puppet/parser/functions/extlookup.rb b/lib/puppet/parser/functions/extlookup.rb index 63d49e563..bc55410b9 100644 --- a/lib/puppet/parser/functions/extlookup.rb +++ b/lib/puppet/parser/functions/extlookup.rb @@ -52,7 +52,7 @@ the exact same outcome: $snmp_contact = extlookup(\"snmp_contact\") -The obove code shows some other features, you can use any fact or variable that +The above code shows some other features, you can use any fact or variable that is in scope by simply using %{varname} in your data files, you can return arrays by just having multiple values in the csv after the initial variable name. diff --git a/lib/puppet/parser/functions/versioncmp.rb b/lib/puppet/parser/functions/versioncmp.rb index 94ba3886f..6091e0923 100644 --- a/lib/puppet/parser/functions/versioncmp.rb +++ b/lib/puppet/parser/functions/versioncmp.rb @@ -14,9 +14,9 @@ Where a and b are arbitrary version strings This functions returns a number: -* > 0 if version a is greater than version b -* == 0 if both version are equals -* < 0 if version a is less than version b +* Greater than 0 if version a is greater than version b +* Equal to 0 if both version are equals +* Less than 0 if version a is less than version b Example: |