puppetlabs/puppetlabs-puppet — pull request #10 by inkblot (2012-08-20 12:25:08+00:00)
Title: Rearrange content in puppet.conf fragments

The puppet.conf fragments supplied by the puppet::agent and puppet::master classes are compatible with each other now, and arranged so that either puppet::agent or puppet::master can be used independently of each other. Using a class { 'puppet': ...} declaration, a system can be declared a master, an agent, or both now.