Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: puppetlabs/puppetlabs-stdlib
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4.0.2
Choose a base ref
...
head repository: puppetlabs/puppetlabs-stdlib
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4.1.0
Choose a head ref
  • 16 commits
  • 11 files changed
  • 6 contributors

Commits on Apr 30, 2013

  1. (maint) Fix a small typo in hash() description

    msmithgu authored and Jeff McCune committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    928036a View commit details
    Browse the repository at this point in the history
  2. Merge branch 'msmithgu-small-typo-fix'

    * msmithgu-small-typo-fix:
      (maint) Fix a small typo in hash() description
    
    closes #148
    Jeff McCune committed Apr 30, 2013
    Configuration menu
    Copy the full SHA
    0aa7e94 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2013

  1. Add a dirname function

    raphink committed May 2, 2013
    Configuration menu
    Copy the full SHA
    2ba9e47 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #150 from raphink/dev/dirname_function

    Add a dirname function
    adrienthebo committed May 2, 2013
    Configuration menu
    Copy the full SHA
    0c68ff6 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2013

  1. (#20548) Allow an array of resource titles to be passed into the ensu…

    …re_resource function
    
    This patch allows an array of resource titles to be passed into
    the ensure_resource function.  Each item in the array will be
    checked for existence and will be created if it doesn't already
    exist.
    Alex Cline committed May 3, 2013
    Configuration menu
    Copy the full SHA
    e08734a View commit details
    Browse the repository at this point in the history

Commits on May 6, 2013

  1. Configuration menu
    Copy the full SHA
    de253db View commit details
    Browse the repository at this point in the history
  2. Refactor ensure_resource expectations

    This splits out the ensure_resource expectations into separate
    blocks for clarity.  Per adrienthebo's recommendation.
    Alex Cline committed May 6, 2013
    Configuration menu
    Copy the full SHA
    b33cc24 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d38bce0 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #152 from AlexCline/feature/master/allow_arrays_in…

    …_ensure_resource
    
    (#20548) Allow an array of resource titles to be passed into the ensure_...
    adrienthebo committed May 6, 2013
    Configuration menu
    Copy the full SHA
    3e59bbd View commit details
    Browse the repository at this point in the history

Commits on May 7, 2013

  1. (maint) Update Gemfile with GEM_FACTER_VERSION

    Without this patch we cannot explicitly set the version of Facter to
    integrate using Bundler.  This patch addresses the problem by adding a
    new environment variable, GEM_FACTER_VERSION which allows bundler to
    install a specific version of Facter.  GEM_FACTER_VERSION is the
    variable name instead of FACTER_GEM_VERSION to prevent the gem_version
    fact from being defined.  In addition, GEM_PUPPET_VERSION is defined
    based on PUPPET_GEM_VERSION in order to match the environment names and
    provide backwards compatibility with CI jobs.
    Jeff McCune committed May 7, 2013
    Configuration menu
    Copy the full SHA
    f44d535 View commit details
    Browse the repository at this point in the history
  2. Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remo…

    …ve_facts_dot_d'"""
    
    This reverts commit 8fc00ea.
    
    We're restoring facts_dot_d support to stdlib because users are pulling
    in the latest version of stdlib while on Puppet Enterprise which breaks
    the operation of PE itself when the fact_stomp_server and
    fact_stomp_port facts are not defined.  They are not defined in PE
    because PE runs with Facter 1.6.17 and Puppet 2.7.21
    Jeff McCune committed May 7, 2013
    Configuration menu
    Copy the full SHA
    77991d3 View commit details
    Browse the repository at this point in the history
  3. (#20582) Restore facter_dot_d to stdlib for PE users

    Without this patch Puppet Enterprise users who install the most recent
    version of stdlib lose the ability to resolve certain facts critical to
    the operation of Puppet Enterprise.  These facts are defined externally
    in the file
    `/etc/puppetlabs/facter/facts.d/puppet_enterprise_installer.txt`.
    As an example, Puppet Enterprise catalogs fail to compile if the
    `fact_stomp_server`, and `fact_stomp_port` facts are not defined.
    
    `facter_dot_d` was removed from stdlib version 4 because Facter version
    1.7 now supports external facts defined in
    `/etc/puppetlabs/facter/facts.d/puppet_enterprise_installer.txt`.
    Puppet Enterprise does not yet include Facter 1.7, however.  The most
    recent PE release, 2.8.1, includes Facter 1.6.17.  With this version of
    Facter, users who replace the version of stdlib that ships with PE with
    the most recent version from the Forge will lose the ability to resolve
    facts from
    `/etc/puppetlabs/facter/facts.d/puppet_enterprise_installer.txt`.
    
    This patch addresses the problem by detecting if Facter version < 1.7 is
    loaded.  If so, then the facter_dot_d.rb facts will be defined using the
    stdlib custom fact.  If Facter >= 1.7 is being used then stdlib will not
    define external facts.
    Jeff McCune committed May 7, 2013
    Configuration menu
    Copy the full SHA
    3b887c8 View commit details
    Browse the repository at this point in the history
  4. (maint) Indent facter_dot_d with 2 spaces

    Whitespace only re-flow of facter_dot_d.rb
    Jeff McCune committed May 7, 2013
    Configuration menu
    Copy the full SHA
    77ea843 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'fix_facts_dot_d_with_pe'

    * fix_facts_dot_d_with_pe:
      (maint) Indent facter_dot_d with 2 spaces
      (#20582) Restore facter_dot_d to stdlib for PE users
      Revert "Revert "Revert "Merge branch 'hkenney-ticket/master/2157_remove_facts_dot_d'"""
      (maint) Update Gemfile with GEM_FACTER_VERSION
    
    closes #153
    Jeff McCune committed May 7, 2013
    Configuration menu
    Copy the full SHA
    226c191 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2013

  1. Update Modulefile, CHANGELOG for version 4.1.0

    This commit alters the module metadata to indicate a 4.1.0 version
    release for the Puppet Forge. It contains backwards compatible
    features, refactors and bug fixes.
    
    CHANGELOG updated by JJM
    Ryan Coleman authored and Jeff McCune committed May 10, 2013
    Configuration menu
    Copy the full SHA
    5c60384 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'puppetlabs-release/four_one_oh'

    * puppetlabs-release/four_one_oh:
      Update Modulefile, CHANGELOG for version 4.1.0
    
    closes #154
    Jeff McCune committed May 10, 2013
    Configuration menu
    Copy the full SHA
    1ffd72d View commit details
    Browse the repository at this point in the history
Loading