summaryrefslogtreecommitdiff
path: root/lib/puppet/parser/functions
diff options
context:
space:
mode:
authorKen Barber <ken@bob.sh>2012-02-07 13:37:16 +0000
committerKen Barber <ken@bob.sh>2012-02-07 13:37:16 +0000
commit46401caef6e00708867d09319985528c39636ba2 (patch)
treebe062a15a4b2e88b6a4108555389f7a69cd2f14a /lib/puppet/parser/functions
parenta03d8cda18ab7cc8e05bdbbb4758afe51779dc86 (diff)
parent52bc8809cbdedbacf219289df1f9f48056e6b935 (diff)
downloadpuppet-stdlib-46401caef6e00708867d09319985528c39636ba2.tar.gz
puppet-stdlib-46401caef6e00708867d09319985528c39636ba2.tar.bz2
Merge branch '2.1.x' into 2.2.x
* 2.1.x: (#12377) Avoid infinite loop when retrying require json
Diffstat (limited to 'lib/puppet/parser/functions')
0 files changed, 0 insertions, 0 deletions