Diffusion puppet 3aed4960c336

Merge branch '2.6.x' into 2.7.x
3aed4960c336Unpublished
Actions

Tags

None

Referenced Files

None

Subscribers

None

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch '2.6.x' into 2.7.x

Details

Provenance

Daniel Pittman <daniel@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPU2a99004fb945: Merge pull request #327 from ripienaar/bug/2.6.x/5246
rPUf4f4158f673b: Merge pull request #331 from joshcooper/ticket/2.7.x/11929-serve-files-in…

Branches

Unknown

Tags

Unknown

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU3aed4960c336: Merge branch '2.6.x' into 2.7.x (authored by Daniel Pittman <daniel@puppetlabs.com>).Jan 13 2012, 10:35 PM

Merged Changes

2a99004fb945 Merge pull request #327 from ripienaar/bug/2.6.x/5246
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
e0e31d571f38 (#5246) Puppetd does not remove it's pidfile when it exits
Author
R.I.Pienaar <rip@devco.net>
Browse Repository
No Builds
No Audits

Changes (2)

Path

Size

lib/

puppet/

application/

spec/

unit/

application/

rPU3aed4960c336

lib/puppet/application/agent.rb

Loading...

spec/unit/application/agent_spec.rb

Loading...