summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-10-25Merge branch '3.1.x' into 3.xJeff McCune
* 3.1.x: Update CHANGELOG, Modulefile for 3.1.1
2012-10-25Update CHANGELOG, Modulefile for 3.1.1Jeff McCune
2012-10-25Merge branch '4.x'Jeff McCune
* 4.x: Update Modulefile, CHANGELOG for 2.5.1
2012-10-25Merge branch '3.x' into 4.xJeff McCune
* 3.x: Update Modulefile, CHANGELOG for 2.5.1
2012-10-25Merge branch '2.x' into 3.xJeff McCune
* 2.x: Update Modulefile, CHANGELOG for 2.5.1 Conflicts: CHANGELOG Modulefile
2012-10-25Merge branch '2.5.x' into 2.xJeff McCune
* 2.5.x: Update Modulefile, CHANGELOG for 2.5.1
2012-10-25Update Modulefile, CHANGELOG for 2.5.1Jeff McCune
2012-10-25Merge branch '4.x'Jeff McCune
* 4.x: Revert "Revert "Merge branch '2.5.x' into 3.0.x"" Revert "Merge branch '2.5.x' into 3.0.x" (maint) Fix spec failures resulting from Facter API changes
2012-10-25Merge branch '3.x' into 4.xJeff McCune
* 3.x: Revert "Revert "Merge branch '2.5.x' into 3.0.x"" Revert "Merge branch '2.5.x' into 3.0.x" (maint) Fix spec failures resulting from Facter API changes
2012-10-25Merge branch '3.1.x' into 3.xJeff McCune
* 3.1.x: Revert "Revert "Merge branch '2.5.x' into 3.0.x"" Revert "Merge branch '2.5.x' into 3.0.x" (maint) Fix spec failures resulting from Facter API changes
2012-10-25Merge branch '2.5.x' into 3.1.xJeff McCune
* 2.5.x: (maint) Fix spec failures resulting from Facter API changes
2012-10-25Revert "Revert "Merge branch '2.5.x' into 3.0.x""Jeff McCune
This reverts commit 9e8c60a8b73fd96393b08d690c7197e62aae623e. This was an error on my part. 3.1.x descends from 3.0.x _and_ 2.5.x, but 3.0.x does not descend from 2.5.x. I should not have merged 2.5.x into 3.0.x, instead I should have merged 2.5.x into 3.1.x skipping over the 3.0.x merge up. I'm slowly starting to understand the implications of semver on our branching strategy... =)
2012-10-25Merge branch '3.0.x' into 3.1.xJeff McCune
* 3.0.x: Revert "Merge branch '2.5.x' into 3.0.x"
2012-10-25Revert "Merge branch '2.5.x' into 3.0.x"Jeff McCune
This reverts commit c8c7afc7a00aaeeddea6514d9fe9508513e53a73, reversing changes made to 03ec16e291a70ac5ac412be36ae3b86a771b98af. This was a mistake on my part. 2.5 is a minor release and minor releases should never be merged into patch level branches. 2.5.x should have been merged into 3.1.x instead.
2012-10-25Merge branch '2.5.x' into 2.xJeff McCune
* 2.5.x: (maint) Fix spec failures resulting from Facter API changes
2012-10-25Merge branch 'fix/2.5.x/facter_loader' into 2.5.xJeff McCune
* fix/2.5.x/facter_loader: (maint) Fix spec failures resulting from Facter API changes
2012-10-25(maint) Fix spec failures resulting from Facter API changesJeff McCune
Without this patch stdlib tests fail against Facter 2.x and master but not 1.6.x. This patch fixes the problem by initializing the example group differently depending on the version of Facter integrating into the system. The adjusted methods are: 1.x - Facter.collection.loader.load 2.x - Facter.collection.load The collection actually implements the load method in both version, it's simply marked as private in 1.x.
2012-10-25Merge branch '4.x'Jeff McCune
* 4.x:
2012-10-25Merge branch '3.x' into 4.xJeff McCune
* 3.x:
2012-10-25Merge branch '3.1.x' into 3.xJeff McCune
* 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'""
2012-10-25Merge branch '3.0.x' into 3.1.xJeff McCune
* 3.0.x: Conflicts: CHANGELOG Modulefile
2012-10-25Merge branch '2.5.x' into 3.0.xJeff McCune
* 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
2012-10-25Merge branch '4.x'Jeff McCune
* 4.x: Update Modulefile, CHANGELOG for 3.1.0
2012-10-25Merge branch '3.1.x' into 4.xJeff McCune
* 3.1.x: Update Modulefile, CHANGELOG for 3.1.0
2012-10-25Update Modulefile, CHANGELOG for 3.1.0Jeff McCune
2012-10-25Merge branch '4.x'Jeff McCune
* 4.x: Revert "Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""" Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
2012-10-25Revert "Revert "Revert "Revert "Merge branch ↵Jeff McCune
'hkenney-ticket/master/2157_remove_facts_dot_d'"""" This reverts commit 2885d314b61055d20d85d36a68214f7d9e1e6ac6. No, really. Keep the !@#$% integration branches around so we don't have this revert nightmare again.
2012-10-25Merge branch '3.1.x'Jeff McCune
* 3.1.x: Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
2012-10-25Revert "Revert "Revert "Merge branch ↵Jeff McCune
'hkenney-ticket/master/2157_remove_facts_dot_d'""" This reverts commit 8fc00ea5b6b39b220ebc6391489915dbeeb364ab. I really wish we could get this right. Without this patch there is no branch that contains backwards-comaptible new functionality relative to the current 3.0.1. There are only branches that contain backwards-incompatible functionality relative to 3.0.1. This is a problem because I need to do a release of stdlib that contains backwards compatible facts but does not contain any breaking changes. This patch fixes the problem by establishing the 3.1.x branch. This branch will then revert the backwards incompatible changes from the 3.1.x branch and revert the revets in the 4.x and master branches. I'll review our merge process, but it seems wrong that there is no place to separate out incompatible from compatible changes when working beyond the most recent patch release.
2012-10-25Merge branch '2.5.x'Jeff McCune
* 2.5.x: Update Modulefile, CHANGELOG for 2.5.0 Conflicts: CHANGELOG Modulefile
2012-10-25Update Modulefile, CHANGELOG for 2.5.0Jeff McCune
2012-10-25Merge branch '2.5.x'Jeff McCune
* 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
2012-10-25Merge branch 'maint/2.5.x/pick_compatible_new_functionality' into 2.5.xJeff McCune
* maint/2.5.x/pick_compatible_new_functionality: 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
2012-10-25Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into ↵Jeff McCune
maint/2.5.x/pick_compatible_new_functionality * maint/2.5.x/pick_explicitly_load_functions: Explicitly load functions used by ensure_resource
2012-10-25Explicitly load functions used by ensure_resourceDan Bode
The ensure_resource function actually calls two other functions, create_resources and defined_with_param. When calling Puppet functions from Ruby, you sometimes have to load the functions manually if they have not been called before. This commit explicitly loads the functions that ensure_resource depends on from within the function.
2012-10-25Merge branch 'maint/2.5.x/pick_pr86_ensure_resource' into ↵Jeff McCune
maint/2.5.x/pick_compatible_new_functionality * maint/2.5.x/pick_pr86_ensure_resource: re-formatting Add better docs about duplicate resource failures Handle undef for parameter argument Add function ensure_resource and defined_with_params
2012-10-25re-formattingDan Bode
This commit refactors to ensure 80 character lines.
2012-10-25Add better docs about duplicate resource failuresDan Bode
This commit adds better inline documentation explaining how replicate resource definitions can occur if the resource exists and does not have matching parameters.
2012-10-25Handle undef for parameter argumentDan Bode
This commit adds better handling of the case where undef is passed as the parameter value. This works by converting '' into []
2012-10-25Add function ensure_resource and defined_with_paramsDan Bode
This commit adds 2 new functions with unit tests. defined_with_params works similarily to puppet's defined function, except it allows you to also specify a hash of params. defined_with_params will return true if a resource also exists that matches the specified type/title (just like with defined) as well as all of the specified params. ensure_resource is a function that basically combines defined_with_params with create_resources to conditionally create resources only if the specified resource (title, type, params) does not already exist. These functions are created to serve as an alternative to using defined as follows: if ! defined(Package['some_package']) { package { 'some_package': ensure => present, } The issue with this usage is that there is no guarentee about what parameters were set in the previous definition of the package that made its way into the catalog. ensure_resource could be used instead, as: ensure_resource('package', 'some_package', { 'ensure' => 'present' }) This will creat the package resources only if another resource does not exist with the specified parameters.
2012-10-25Merge branch '2.5.x'Jeff McCune
* 2.5.x: Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""
2012-10-25Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""Jeff McCune
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e. This backwards-compatible additional functionality is targeted at the next minor release. There are already backwards-incompatible changes in the master branch so we need to establish a new minor branch.
2012-10-25Revert "Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x""Jeff McCune
This reverts commit d6d23b495cda0e154b4e73982acc43e586564c0e. Why? Because this change set should actually be in master and our merge-up process reverted the change set in master when I reverted from 2.4.x. This patch reverts the revert, restoring the original change set.
2012-10-25Merge branch '2.4.x'Jeff McCune
* 2.4.x: Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"
2012-10-25Revert "Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.x"Jeff McCune
This reverts commit 74e6411157b8df1af9a24c17971e3236f3096529, reversing changes made to 417d219aa6e42f2a16af42c98aa063fc1d9d2ecd. Here's why: Actually... I just screwed this up. I merged this new fact into 2.4.x but it's not fixing any bug. It's adding a new fact, so this should go into master and we should release 2.5 since this is new, backwards-compatible functionality.
2012-10-25Merge branch '2.4.x'Jeff McCune
* 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: spec/spec_helper.rb
2012-10-25Merge branch 'haus-add_pe_facts_to_stdlib' into 2.4.xJeff McCune
* haus-add_pe_facts_to_stdlib: 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
2012-10-25Prevent undefined method `split' for nil:NilClass with pe_foo_version factsJeff McCune
Without this patch the pe_major_version, pe_minor_version, and pe_patch_version facts directly depend on the pe_version fact in a manner that calls split directly on the return value. This is a problem because Fact values are not always guaranteed to return strings, or objects that respond to split. This patch is a defensive measure to ensure we're always calling the split method on a string object. If the Fact returns nil, this will be converted to an empty string responding to split.
2012-10-24(maint) Clear all facts before each exampleJeff McCune
Without this patch example groups must explicitly call `Facter.clear` to clear any cached values between examples. This is a problem because this behavior is not the concern of the example groups, the behavior is the concern of the spec_helper or whatever facility we have in place to initialize the system for testing. This patch fixes the problem by duplicating the logic in the Facter spec_helper to ensure facts are cleared out before each example. This patch requires the example groups to explicitly load the facts they require if the fact name does not match the filename.
2012-10-24Add spec tests for pe_version factsMatthaus Owens
This commit adds some basic spec tests for the pe_version facts. There are basic postitive and negative cases.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 08:54:24 +0000