HomePhorge
Diffusion puppet 9ed1235c2959

Merge remote branch 'masterzen/feature/master/4339' into next
9ed1235c2959Unpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge remote branch 'masterzen/feature/master/4339' into next

Manually resolved conflicts:
spec/unit/configurer_spec.rb

Details

Provenance
Paul Berry <paul@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUccc944f21a25: Fix #4339 - Locally save the last report to $lastrunreport
rPUa10deae8913f: Merge branch 'ticket/2.6.x/5370' into next
Branches
Unknown
Tags
Unknown

Event Timeline

Paul Berry <paul@puppetlabs.com> committed rPU9ed1235c2959: Merge remote branch 'masterzen/feature/master/4339' into next (authored by Paul Berry <paul@puppetlabs.com>).Nov 22 2010, 8:56 PM

Merged Changes

Changes (13)

PathSize
lib/
puppet/
application/
indirector/
report/
transaction/
util/
spec/
integration/
unit/
application/
indirector/
report/
transaction/

rPU9ed1235c2959

View Options

lib/puppet/application/agent.rb

Loading...
View Options

lib/puppet/application/apply.rb

Loading...
View Options

lib/puppet/configurer.rb

Loading...
View Options

lib/puppet/defaults.rb

Loading...
View Options

lib/puppet/indirector/report/yaml.rb

Loading...
View Options

lib/puppet/transaction/report.rb

Loading...
View Options

lib/puppet/util/metric.rb

Loading...
View Options

spec/integration/configurer_spec.rb

Loading...
View Options

spec/unit/application/agent_spec.rb

Loading...
View Options

spec/unit/application/apply_spec.rb

Loading...
View Options

spec/unit/configurer_spec.rb

Loading...
View Options

spec/unit/indirector/report/yaml_spec.rb

Loading...
View Options

spec/unit/transaction/report_spec.rb

Loading...