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

1  2 
lib/facter/facter_dot_d.rb patch | diff1 | diff2 | blob | history

diff --cc lib/facter/facter_dot_d.rb
Simple merge
Puppet module for stdlib