]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
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)
commit46401caef6e00708867d09319985528c39636ba2
treebe062a15a4b2e88b6a4108555389f7a69cd2f14a
parenta03d8cda18ab7cc8e05bdbbb4758afe51779dc86
parent52bc8809cbdedbacf219289df1f9f48056e6b935
Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  (#12377) Avoid infinite loop when retrying require json