HomePhorge
Diffusion puppet 9d551be70ab2

Merge branch 'ticket/next/4798-rdoc-fixes' into next
9d551be70ab2Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge branch 'ticket/next/4798-rdoc-fixes' into next

  • ticket/next/4798-rdoc-fixes: (#4798) Make rdoc work if moduledir & manifestdir overlap maint: Fix rdoc when documenting manifest files maint: Move puppetdoc settings to defaults so we can use them in tests

Details

Provenance
Max Martin <max@puppetlabs.com>Authored on
vanmeeuwenPushed on Jun 2 2015, 2:22 PM
Parents
rPU2a915725adf0: (#4798) Make rdoc work if moduledir & manifestdir overlap
rPUc3ec3d100fb2: Merge branch 'maint/refs/heads/next/MAINT-spec-integration-configurer-has…
Branches
Unknown
Tags
Unknown

Event Timeline

Max Martin <max@puppetlabs.com> committed rPU9d551be70ab2: Merge branch 'ticket/next/4798-rdoc-fixes' into next (authored by Max Martin <max@puppetlabs.com>).Mar 8 2011, 10:32 PM

Merged Changes

Changes (9)

PathSize
lib/
puppet/
application/
util/
rdoc/
spec/
fixtures/
unit/
util/
integration/
application/
unit/
util/

rPU9d551be70ab2

View Options

lib/puppet/application/doc.rb

Loading...
View Options

lib/puppet/defaults.rb

Loading...
View Options

lib/puppet/util/rdoc.rb

Loading...
View Options

lib/puppet/util/rdoc/parser.rb

Loading...
View Options

spec/fixtures/unit/util/rdoc/basic.pp

Loading...
View Options

spec/integration/application/doc_spec.rb

Loading...
View Options

spec/unit/util/rdoc_spec.rb

Loading...