summaryrefslogtreecommitdiffstats
path: root/lib/puppet/reference/function.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-07-19 19:59:01 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-07-19 19:59:04 -0700
commit2af27160b94efa4755187efd99c86d1659683b29 (patch)
treee478abb994e64164061be7d6adc1f2c8147ec9eb /lib/puppet/reference/function.rb
parent21efa7b282080c69760a17576dff60c01821a963 (diff)
parentd87a2e39d1a6104c52b1213a654ec9d58d0bff7f (diff)
downloadpuppet-2af27160b94efa4755187efd99c86d1659683b29.tar.gz
puppet-2af27160b94efa4755187efd99c86d1659683b29.tar.xz
puppet-2af27160b94efa4755187efd99c86d1659683b29.zip
Merge branch 'master' into next
This is the code for 2.6 RC4
Diffstat (limited to 'lib/puppet/reference/function.rb')
0 files changed, 0 insertions, 0 deletions