HomePhorge
Diffusion puppet 71fbf00834d1

Merge remote-tracking branch 'upstream/stable'
71fbf00834d1Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/stable'

  • upstream/stable: (PUP-2584) Make 404 warning on agent specific and an error. (PUP-1894) Fix issue with loading EPP from modules

Conflicts:
lib/puppet/configurer.rb

Resolved, merging in stable's :fail_on_404 option into the node
indirection request, and keeping master's changes to set a remote env in
the node in the likely case that locally there is no matching directory
env.

Details

Provenance
Josh Partlow <joshua.partlow@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU8e473d1bc349: Merge pull request #2669 from jpartlow/issue/master/pup-2584-make-404-warning…
rPUf3cf93a72fa0: (maint) Replace runtime logging line lost in merge of PUP-2610
Branches
Unknown
Tags
Unknown

Event Timeline

Josh Partlow <joshua.partlow@puppetlabs.com> committed rPU71fbf00834d1: Merge remote-tracking branch 'upstream/stable' (authored by Josh Partlow <joshua.partlow@puppetlabs.com>).May 19 2014, 8:45 PM

Merged Changes

Changes (7)

PathSize
lib/
puppet/
indirector/
parser/
functions/
ssl/
spec/
unit/
indirector/
parser/
functions/
ssl/

rPU71fbf00834d1

View Options

lib/puppet/configurer.rb

Loading...
View Options

lib/puppet/indirector/rest.rb

Loading...
View Options

lib/puppet/parser/functions/epp.rb

Loading...
View Options

lib/puppet/ssl/host.rb

Loading...
View Options

spec/unit/indirector/rest_spec.rb

Loading...
View Options

spec/unit/parser/functions/epp_spec.rb

Loading...
View Options

spec/unit/ssl/host_spec.rb

Loading...