]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a03d8cd 52bc880)
Merge branch '2.1.x' into 2.2.x
authorKen Barber <ken@bob.sh>
Tue, 7 Feb 2012 13:37:16 +0000 (13:37 +0000)
committerKen Barber <ken@bob.sh>
Tue, 7 Feb 2012 13:37:16 +0000 (13:37 +0000)
* 2.1.x:
  (#12377) Avoid infinite loop when retrying require json


Trivial merge
Puppet module for stdlib