]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa1e743 59cc85d)
Merge branch '2.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 01:08:12 +0000 (17:08 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 01:08:12 +0000 (17:08 -0800)
* 2.x:
  Revert "(Maint) Add spec/functions to rake test task"

Conflicts:
Rakefile


Trivial merge
Puppet module for stdlib