]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.4.x'
authorJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 23:57:13 +0000 (16:57 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 23:57:13 +0000 (16:57 -0700)
commit07700216bb916a95d376810f85551df9a3580334
tree0381cdd227b4e667b4e2937e460391f666cdabc9
parenta1a5f7487d2009c92f68475c60c2fcaadcfe21e4
parent6b76c338650a3af5270b6578b5e580f801c34a5b
Merge branch '2.4.x'

* 2.4.x:
  (#13439) Fix test failures with Puppet 2.6.x
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master