diff options
| author | Max Martin <max@puppetlabs.com> | 2011-03-08 13:32:25 -0800 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-03-08 13:32:25 -0800 |
| commit | 9d551be70ab2a5d64a75a5c497534b0413cd3d81 (patch) | |
| tree | 062d88419140fd3d848d68946c76cd3e75baeec5 /spec/integration | |
| parent | c3ec3d100fb27211bf86c12bdc759d1fa1afce25 (diff) | |
| parent | 2a915725adf0ccefcc28653cbba2219925194594 (diff) | |
| download | puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.tar.gz puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.tar.xz puppet-9d551be70ab2a5d64a75a5c497534b0413cd3d81.zip | |
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
Diffstat (limited to 'spec/integration')
| -rw-r--r-- | spec/integration/application/doc_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/integration/application/doc_spec.rb b/spec/integration/application/doc_spec.rb index d94b3043b..f0b9d7db0 100644 --- a/spec/integration/application/doc_spec.rb +++ b/spec/integration/application/doc_spec.rb @@ -7,7 +7,6 @@ describe Puppet::Application::Doc do include PuppetSpec::Files it "should not generate an error when module dir overlaps parent of site.pp (#4798)" do - pending "need to fix as part of fixing Brice's rdoc patch" begin # Note: the directory structure below is more complex than it # needs to be, but it's representative of the directory structure |