From e761d31212a340a4c54f76d6308c42f569d4046d Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Mon, 16 Jul 2012 15:10:26 -0400
Subject: remove no longer needed inheritance of puppet::puppetmaster::package
 as we are not doing any overrides, instead we can just include the classes
 that we also want to load

---
 manifests/puppetmaster/debian.pp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'manifests/puppetmaster')

diff --git a/manifests/puppetmaster/debian.pp b/manifests/puppetmaster/debian.pp
index 0c81a64..f440ba3 100644
--- a/manifests/puppetmaster/debian.pp
+++ b/manifests/puppetmaster/debian.pp
@@ -1,5 +1,8 @@
-class puppet::puppetmaster::debian inherits puppet::puppetmaster::package {
+class puppet::puppetmaster::debian {
 
+  include puppet::puppetmaster::package
+  include puppet::puppetmaster::linux
+  
   if $puppetmaster_mode != 'passenger' {
     case $lsbdistcodename {
       squeeze,sid: {
-- 
cgit v1.2.3