diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 11:59:02 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-10-25 11:59:02 -0700 |
| commit | c8c7afc7a00aaeeddea6514d9fe9508513e53a73 (patch) | |
| tree | 6cfe459dced10ecd8f88bcf079e5ffee717083e6 /Modulefile | |
| parent | 03ec16e291a70ac5ac412be36ae3b86a771b98af (diff) | |
| parent | 88af331b0e9b0e8c8a3c1e74e4c5598dc7b8e1c8 (diff) | |
Merge branch '2.5.x' into 3.0.x
* 2.5.x:
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 "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
Conflicts:
CHANGELOG
Modulefile
spec/spec_helper.rb
Diffstat (limited to 'Modulefile')
0 files changed, 0 insertions, 0 deletions