-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-07-25 01:00:37 UTC
-
mfrom:
(1.1.24 upstream)
(3.1.25 sid)
-
Revision ID:
james.westby@ubuntu.com-20110725010037-875vuxs10eboqgw3
Tags: 2.7.1-1ubuntu1
* Merge from debian unstable. Remaining changes:
- debian/puppetmaster-passenger.postinst: Use cacrl instead of hostcrl to
set the location of the CRL in apache2 configuration. Fix apache2
configuration on upgrade as well (LP: #641001)
- move all puppet dependencies to puppet-common since all the code
actually located in puppet-common.
- move libagueas from a recommend to a dependency.