diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 16:55:46 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 16:55:46 -0700 |
| commit | 6065628493e775e3e6ddb59f272bd36a9e9fe072 (patch) | |
| tree | e56b88c89e00cfa75fbb30dd84ef77fd1bef525a /lib | |
| parent | 4ab56c385ac65129c84b085d60bcfd7e0aa126ff (diff) | |
| parent | d22fbe32cd626091b32c8a0c0a8c83771a0c999a (diff) | |
Merge branch '2.2.x' into 2.3.x
* 2.2.x:
(#13439) Fix test failures with Puppet 2.6.x
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions