Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on May 22, 2015
  1. @shrug

    Merge pull request #3935 from melissa/maint/master/systemd-update

    shrug authored
    (maint) Update service to work on debian
  2. @melissa

    (maint) Remove puppetmaster.service

    melissa authored
    The puppetmaster.service is not used anymore with the switch to
    puppetserver. This commit removes the service file, and removed
    references from puppet.service
  3. @melissa

    (maint) Update service to work on debian

    melissa authored
    Unlike redhat, debian stores env files in '/etc/default'. We need to be
    able to search there in order to access them. This commit adds that
    search path to the systemd service file. Note that this works because
    the service doesn't depend on the existance of those files. So, on
    redhat, neither '/etc/default/puppet' nor '/etc/default/puppetagent'
    will exist, but the service will continue to run regardless.
Commits on May 21, 2015
  1. @peterhuene

    Merge branch 'stable'

    peterhuene authored
    * stable:
      (maint) remove extra gems from appveyor
      (PUP-4431) Fix getpid usage in base service provider
      (maint) Attach pe classifier groups to Production environment group
  2. @peterhuene

    Merge pull request #3951 from kylog/issue/pup-4431

    peterhuene authored
    (PUP-4431) Fix getpid usage in base service provider
  3. @kylog

    Merge pull request #3804 from jpartlow/maint/stable/fix-puppet-accept…

    kylog authored
    …ance-classification-for-pe
    
    (maint) Attach pe classifier groups to Production environment group
Commits on May 20, 2015
  1. @ferventcoder

    Merge pull request #3957 from Iristyle/fix/stable/appveyor

    ferventcoder authored
    (maint) remove extra gems from appveyor
  2. @Iristyle

    (maint) remove extra gems from appveyor

    Iristyle authored
     - When running specs in our local Jenkins environment, the
       'extra' gems, which include 'msgpack' are not installed.  We do
       this because:
    
       - 'msgpack' requires building native code, which unnecessarily
         adds to the feedback loop
       - we intentionally try to maintain a clean environment without
         the Ruby DevKit installed
    
       This has previously worked on AppVeyor because they have the
       Ruby DevKit installed.
  3. @Iristyle

    Merge remote-tracking branch 'origin/stable'

    Iristyle authored
    * origin/stable:
      (maint) Archive spec_order.txt on appveyor failures
  4. @Iristyle

    Merge pull request #3955 from joshcooper/windows-failures

    Iristyle authored
    (maint) Archive spec_order.txt on appveyor failures
  5. @joshcooper

    (maint) Archive spec_order.txt on appveyor failures

    joshcooper authored
    Previously, tests executed in a platform-specific order in appveyor, and
    if an order dependent failure happened, we didn't know what the order
    was.
    
    This commit sets the `LOG_SPEC_ORDER` environment variable which causes
    puppet's spec helper to write each spec to `spec_order.txt` in the
    project root.
    
    It also adds an `on_failure` handler to archive the file, which can then
    be downloaded from the job's Artifacts tab.
Commits on May 19, 2015
  1. @peterhuene

    Merge pull request #3808 from karmux/master

    peterhuene authored
    (PUP-3480) Python 3 package provider (pip3).
  2. @haus

    Merge pull request #3932 from melissa/ticket/master/service-default-j…

    haus authored
    …essie-vivid
    
    (PUP-4503)(PUP-2023) Update service provider default for newer debian…
  3. @melissa

    (maint) Fix whitespace errors

    melissa authored
  4. @melissa

    (PUP-4503)(PUP-2023) Update service provider default for newer debian…

    melissa authored
    …/ubuntu releases
    
    With the release of Debian 8 (Jessie) and Ubuntu 15.04 (Vivid Vervet),
    ubuntu and debian now default to systemd as the main service manager,
    rather than init or upstart. This commit updates Puppet to
    use systemd as the default service provider on these two systems, while
    also defaulting back to other service providers if necessary.
    
    Additionally, there is a bug on debian systemd where it is unable to
    correctly detect SysV style services[1]. This commit also adds in a
    workaround to correctly detect `is-enabled` for these services.
    
    [1] - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=751638
  5. @hlindberg

    Merge branch 'stable'

    hlindberg authored
  6. @hlindberg

    Merge branch '3.x' into stable

    hlindberg authored
    Conflicts:
    	lib/puppet/version.rb
  7. @hlindberg
  8. @hlindberg
  9. @kylog

    Merge branch 'stable'

    kylog authored
  10. @kylog
  11. @kurtwall

    Merge pull request #3941 from justinstoller/maint/3.x/QENG-1453_use_i…

    kurtwall authored
    …nternal_epel_mirror
    
    (QENG-1453) Make use of Beaker's epel_url option
  12. @hlindberg

    Merge branch 'stable'

    hlindberg authored
  13. @hlindberg

    Merge branch '3.x' into stable

    hlindberg authored
    Conflicts:
    	lib/puppet/functions/defined.rb
  14. @hlindberg

    Merge pull request #3950 from kylog/fix-spec-warnings-part-deux

    hlindberg authored
    fix-spec-warnings-part-deux
  15. @kylog

    (PUP-4431) Fix getpid usage in base service provider

    kylog authored
    Commit 345da4d removed use of facter 2.x's 'ps' fact in favor
    of picking the proper 'ps' invocation in the base provider. However,
    it introduced two bugs around the usage of getpid:
    
    1) it made getpid private (which makes sense) but left an unneeded
       use of 'self.getpid' in the code (this can just be 'getpid')
    2) the refactoring left a reference to an abandoned local variable,
       'ps', in a debug message (this can be restored)
    
    This commit fixes those two bugs.
  16. @kylog
  17. @joshcooper

    Merge remote-tracking branch 'upstream/stable'

    joshcooper authored
    * upstream/stable:
      (PUP-3829) : call 'pip' instead of 'pip-python' on RedHat > 6 in the pip package provider
      (docs) Generate man pages
      (PUP-2630) Ensure $server_facts works with apply
      (PUP-2630) Populate $server_facts during puppet apply
      (docs) Revise description of trusted_server_facts setting
      (maint) Fix for PUP-4483.
      (PUP-4552) Use TypeCalculator.infer_set for type validation errors
    
    Conflicts:
    	spec/integration/application/apply_spec.rb
  18. @joshcooper

    Merge remote-tracking branch 'upstream/3.x' into stable

    joshcooper authored
    * upstream/3.x:
      (PUP-3829) : call 'pip' instead of 'pip-python' on RedHat > 6 in the pip package provider
      (maint) Fix for PUP-4483.
      (PUP-4552) Use TypeCalculator.infer_set for type validation errors
    
    Conflicts:
    	lib/puppet/resource.rb
    	spec/integration/parser/future_compiler_spec.rb
    	spec/unit/provider/package/pip_spec.rb
    
    lib/puppet/resource.rb was changed in 3.x to call
    `TypeCalculator.infer_set`, but it occurs in a `if !Puppet.future_parser?`
    block. It conflicted, because the `future_parser?` predicate doesn't exist
    in stable, and the change to use `infer_set` was already done in stable.
    Kept call to `infer_set`.
    
    spec/integration/parser/future_compiler_spec.rb was modified in 3.x, but
    no longer exists in stable, and the test was already implemented in
    stable's spec/integration/parser/compiler_spec.rb. Removed
    future_compiler_spec.rb.
    
    spec/unit/provider/package/pip_spec.rb was backported to 3.x, but the
    original commit used rspec 2 style expectations, which were later
    fixed in stable, but not included in the backport (since 3.x doesn't
    require rspec 3). Updated test to use rspec 3 expectations.
  19. @MikaelSmith

    Merge pull request #3921 from peterhuene/pup/1295

    MikaelSmith authored
    (PUP-1295) Fix always purging package resources that are not installed.
Commits on May 18, 2015
  1. @joshcooper

    Merge remote-tracking branch 'upstream/pr/3948' into 3.x

    joshcooper authored
    * upstream/pr/3948:
      (PUP-3829) : call 'pip' instead of 'pip-python' on RedHat > 6 in the pip package provider
  2. @justinstoller

    (maint) Make use of Beaker's epel_url option

    justinstoller authored
    Previously we were depending on the "use-el-extras" feature of Beaker
    but we were not taking full advantage of its ability to point at an EPEL
    mirror.  We have sporadically seen failures based on the availability of
    the mirrors at kernel.org.
    
    This commit infers if we are running within the internal network by
    looking for a well known environment variable and, if so, adds the
    appropriate beaker configuration to use our internal epel mirror.
  3. @gillesgagniard @peterhuene

    (PUP-3829) : call 'pip' instead of 'pip-python' on RedHat > 6 in the …

    gillesgagniard authored peterhuene committed
    …pip package provider
  4. @peterhuene

    (PUP-1295) Fix always purging package resources that are not installed.

    peterhuene authored
    For package providers, the base package provider was defaulting to a
    property hash with a status of :absent when the package was missing.
    
    When the resource is `ensure => purged`, an :absent status causes it to
    be purged.  This is because an absent package could represent a
    "partially installed" package that is not truly installed and can
    therefore be purged (see the dpkg provider).  If the base provider
    always returns a status of :absent for missing packages then purgeable
    providers will always attempt to purge a missing resource.
    
    The fix is to have the base provider default to a :purged status when
    the resource is missing and the provider supports purging.  Otherwise,
    it defaults to :absent like before.
  5. @kylog

    Merge pull request #3940 from nfagerlund/may2015_trusted_facts_docs

    kylog authored
    (docs) Revise description of trusted_server_facts setting
Something went wrong with that request. Please try again.