]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
Merge branch '2.x' into 3.x
authorJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 00:22:11 +0000 (16:22 -0800)
committerJeff McCune <jeff@puppetlabs.com>
Wed, 28 Nov 2012 00:22:11 +0000 (16:22 -0800)
* 2.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

Conflicts:
Rakefile


Trivial merge