]> gitweb.fluxo.info Git - puppet-stdlib.git/commit
Merge branch '2.2.x' into 2.3.x
authorJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 23:26:13 +0000 (16:26 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 29 Mar 2012 23:26:13 +0000 (16:26 -0700)
commit4ab56c385ac65129c84b085d60bcfd7e0aa126ff
treee540a05bd3169c7514e9780fc0e59a0053122b1e
parentfea0b06bc828f452900943db962f4f7645bb0802
parentcbdffb711fb109628ecdada9083f064b2e8d3a64
Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master
spec/spec_helper.rb