-
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.