From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 17:59:13 +0000 (-0700)
Subject: Merge branch '2.5.x'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=a748735f4637089dbbee7920b70f5a7033148c0c;p=puppet-stdlib.git

Merge branch '2.5.x'

* 2.5.x:
  Explicitly load functions used by ensure_resource
  re-formatting
  Add better docs about duplicate resource failures
  Handle undef for parameter argument
  Add function ensure_resource and defined_with_params
---

a748735f4637089dbbee7920b70f5a7033148c0c