]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fea0b06 cbdffb7)
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)
* 2.2.x:
  (#13439) refactor spec helper for compatibility with both puppet 2.7 and master

1  2 
spec/spec_helper.rb patch | diff1 | diff2 | blob | history

diff --cc spec/spec_helper.rb
Simple merge
Puppet module for stdlib