HomePhorge
Diffusion puppet 3c0483fad82d

Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ticket/2.
3c0483fad82dUnpublished
Actions

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ticket/2.7rc/maint-doc_changes_without_failures

  • ticket/2.7rc/maint-faces_docs_spec_fixes: maint: Fix order dependent spec failure for face indirection (#7690) Don't blow up when listing terminuses available for faces maint: Dedup the loadpath so we don't have to walk it multiple times Maint: Fix ellipses for short descriptions

Resolved Conflicts:
lib/puppet/interface/documentation.rb

Details

Provenance
Matt Robinson <matt@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPUea7908b8d6dc: maint: Fix order dependent spec failure for face indirection
rPU76887064b769: (#7563) DRY: Remove indirector boilerplate from individual faces
Branches
Unknown
Tags
Unknown

Event Timeline

Matt Robinson <matt@puppetlabs.com> committed rPU3c0483fad82d: Merge branch 'ticket/2.7rc/maint-faces_docs_spec_fixes' into ticket/2. (authored by Matt Robinson <matt@puppetlabs.com>).May 27 2011, 1:12 AM

Merged Changes

Changes (8)

PathSize
lib/
puppet/
application/
indirector/
interface/
util/
spec/
shared_behaviours/
unit/
application/
indirector/
util/

rPU3c0483fad82d

View Options

lib/puppet/application/faces.rb

Loading...
View Options

lib/puppet/indirector/terminus.rb

Loading...
View Options

lib/puppet/interface/documentation.rb

Loading...
View Options

lib/puppet/util/autoload.rb

Loading...
View Options

spec/shared_behaviours/documentation_on_faces.rb

Loading...
View Options

spec/unit/application/indirection_base_spec.rb

Loading...
View Options

spec/unit/indirector/terminus_spec.rb

Loading...
View Options

spec/unit/util/autoload_spec.rb

Loading...