From: Jeff McCune <jeff@puppetlabs.com>
Date: Wed, 28 Nov 2012 00:22:11 +0000 (-0800)
Subject: Merge branch '2.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=aa1e743e385d7f7b1a4e948564e03231ab535e97;p=puppet-stdlib.git

Merge branch '2.x' into 3.x

* 2.x:
  (Maint) Add spec/functions to rake test task
  Add example behaviors for ensure_packages() function
  Add an ensure_packages function.

Conflicts:
	Rakefile
---

aa1e743e385d7f7b1a4e948564e03231ab535e97