← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to lib/puppet/util/rdoc/code_objects.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/util/rdoc/code_objects.rb
4
4
 
5
5
    # This modules contains various class that are used to hold information
6
6
    # about the various Puppet language structures we found while parsing.
7
 
    # 
 
7
    #
8
8
    # Those will be mapped to their html counterparts which are defined in
9
9
    # PuppetGenerator.
10
10
 
102
102
        def is_module?
103
103
            false
104
104
        end
 
105
 
 
106
        def superclass=(superclass)
 
107
            @superclass = superclass
 
108
        end
105
109
    end
106
110
 
107
111
    # PuppetNode holds a puppet node