diff options
| author | Ken Barber <ken@bob.sh> | 2012-02-07 13:44:58 +0000 |
|---|---|---|
| committer | Ken Barber <ken@bob.sh> | 2012-02-07 13:44:58 +0000 |
| commit | d6fdfaba11aeff35604f1d5a917823f145a1cb76 (patch) | |
| tree | 1561491f9e3d9a67fa73399338ddf9bd675ae3f7 /lib/puppet/type/file_line.rb | |
| parent | 01b61a048367dc8fcf616985cc3076624f980058 (diff) | |
| parent | 46401caef6e00708867d09319985528c39636ba2 (diff) | |
| download | puppet-stdlib-d6fdfaba11aeff35604f1d5a917823f145a1cb76.tar.gz puppet-stdlib-d6fdfaba11aeff35604f1d5a917823f145a1cb76.tar.bz2 | |
Merge branch '2.2.x'
* 2.2.x:
(#12377) Avoid infinite loop when retrying require json
Diffstat (limited to 'lib/puppet/type/file_line.rb')
0 files changed, 0 insertions, 0 deletions