Diffusion puppet 67e4e399480d

Merge branch '2.6.x' into 2.7.x
67e4e399480dUnpublished
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

Conflicts:
lib/puppet/application/queue.rb
lib/puppet/defaults.rb

Details

Provenance

Joshua Harlan Lifton <lifton@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUe29b5df49e2d: Merge pull request #198 from ody/feature/2.6.x/5617
rPU4462eb5b4aa4: Merged 2.6.x into 2.7x

Branches

Unknown

Tags

Unknown

Event Timeline

Joshua Harlan Lifton <lifton@puppetlabs.com> committed rPU67e4e399480d: Merge branch '2.6.x' into 2.7.x (authored by Joshua Harlan Lifton <lifton@puppetlabs.com>).Nov 17 2011, 12:51 AM

Merged Changes

e29b5df49e2d Merge pull request #198 from ody/feature/2.6.x/5617
Author
Daniel Pittman <daniel@rimspace.net>
Browse Repository
No Builds
No Audits
9dfd011e43cd (#5617) Puppet queue logging
Author
Cody Herriges <cody@puppetlabs.com>
Browse Repository
No Builds
No Audits
85dceff5691c Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
a91cfa14dde5 maint: Fix failing spec on old version of rspec
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
8ed8ae1fb5ae Merge remote-tracking branch 'nicklewis/ticket/2.6.x/10289' into 2.6.x
Author
Jacob Helwig <jacob@puppetlabs.com>
Browse Repository
No Builds
No Audits
aa2a762021ed (#10289) Add an ext script to upload facts to inventory server
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits
5129d3858432 (#10289) Add a safe alternative to REST for inventory service
Author
Nick Lewis <nick@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (1)

Path

Size

lib/

puppet/

application/

rPU67e4e399480d

lib/puppet/application/queue.rb

Loading...