From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 25 Oct 2012 19:01:01 +0000 (-0700)
Subject: Merge branch '3.1.x' into 3.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=4004a758b0c01ac17206a838f91f8cf5c57cc466;p=puppet-stdlib.git

Merge branch '3.1.x' into 3.x

* 3.1.x:
  Update Modulefile, CHANGELOG for 3.1.0
  Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
  Update Modulefile, CHANGELOG for 2.5.0
  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
  Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
  Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
  Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
  Prevent undefined method `split' for nil:NilClass with pe_foo_version facts
  (maint) Clear all facts before each example
  Add spec tests for pe_version facts
  Add PE facts to stdlib
  Fix some logical inconsistencies in README
  (#14422) Update README to include the bug tracker URL.
  Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'""
---

4004a758b0c01ac17206a838f91f8cf5c57cc466