Merge branch '2.6.x' into 2.7.x
8baa4897e777Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.x' into 2.7.x

Details

Provenance

Nick Lewis <nick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU0157bf3ee2d5: Merge branch 'ticket/2.6.x/8596' into 2.6.x
rPU62b6b0c43880: Merge branch 'tickets/2.7.x/7293' into 2.7.x

Branches

Unknown

Tags

Unknown

Event Timeline

Nick Lewis <nick@puppetlabs.com> committed rPU8baa4897e777: Merge branch '2.6.x' into 2.7.x (authored by Nick Lewis <nick@puppetlabs.com>).Jul 26 2011, 1:55 AM

Merged Changes

0157bf3ee2d5 Merge branch 'ticket/2.6.x/8596' into 2.6.x
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
fb2ffd6879f4 (#8596) Detect resource alias conflicts when titles do not match
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
c7361629dff0 Merge branch 'ticket/2.6.x/8418-inspect_respect_run_mode' into 2.6.x
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
89c021cac52a (#8418) Fix inspect app to have the correct run_mode
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
3165364e20fc maint: Adding logging to include environment when source fails
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits
f484851b7528 maint: Add debug logging when the master receives a report
Author
Matt Robinson <matt@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (7)

Path

Size

lib/

puppet/

application/

inspect.rb

indirector/

report/

processor.rb

resource/

catalog.rb

type/

file/

source.rb

spec/

unit/

application/

inspect_spec.rb

indirector/

report/

processor_spec.rb

resource/

catalog_spec.rb

rPU8baa4897e777

View Options

lib/puppet/application/inspect.rb

View Options

lib/puppet/indirector/report/processor.rb

View Options

lib/puppet/resource/catalog.rb

View Options

lib/puppet/type/file/source.rb

View Options

spec/unit/application/inspect_spec.rb

View Options

spec/unit/indirector/report/processor_spec.rb

View Options

spec/unit/resource/catalog_spec.rb

Merge branch '2.6.x' into 2.7.x8baa4897e777UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (7)

rPU8baa4897e777

lib/puppet/application/inspect.rb

lib/puppet/indirector/report/processor.rb

lib/puppet/resource/catalog.rb

lib/puppet/type/file/source.rb

spec/unit/application/inspect_spec.rb

spec/unit/indirector/report/processor_spec.rb

spec/unit/resource/catalog_spec.rb

Merge branch '2.6.x' into 2.7.x
8baa4897e777Unpublished
Actions