HomePhorge
Diffusion puppet 4462eb5b4aa4

Merged 2.6.x into 2.7x
4462eb5b4aa4Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merged 2.6.x into 2.7x

Manually resolved conflicts:
lib/puppet/application/queue.rb
lib/puppet/defaults.rb

Details

Provenance
Joshua Harlan Lifton <lifton@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU5bb0fb7b484e: Merge remote-tracking branch 'josh/ticket/2.7.x/10727-undefined-method…
Branches
Unknown
Tags
Unknown

Event Timeline

Joshua Harlan Lifton <lifton@puppetlabs.com> committed rPU4462eb5b4aa4: Merged 2.6.x into 2.7x (authored by Joshua Harlan Lifton <lifton@puppetlabs.com>).Nov 15 2011, 6:21 PM

Changes (5)

PathSize
ext/
lib/
puppet/
application/
indirector/
facts/
spec/
unit/
indirector/
facts/

rPU4462eb5b4aa4

View Options

ext/upload_facts.rb

Loading...
View Options

lib/puppet/application/queue.rb

Loading...
View Options

lib/puppet/defaults.rb

Loading...
View Options

lib/puppet/indirector/facts/inventory_service.rb

Loading...
View Options

spec/unit/indirector/facts/inventory_service_spec.rb

Loading...