diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 16:56:26 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-03-29 16:56:26 -0700 |
| commit | 6b76c338650a3af5270b6578b5e580f801c34a5b (patch) | |
| tree | 0381cdd227b4e667b4e2937e460391f666cdabc9 /lib/puppet | |
| parent | a1a5f7487d2009c92f68475c60c2fcaadcfe21e4 (diff) | |
| parent | 6065628493e775e3e6ddb59f272bd36a9e9fe072 (diff) | |
Merge branch '2.3.x' into 2.4.x
* 2.3.x:
(#13439) Fix test failures with Puppet 2.6.x
(#13439) refactor spec helper for compatibility with both puppet 2.7 and master
Diffstat (limited to 'lib/puppet')
0 files changed, 0 insertions, 0 deletions