From d7acd567ace308049848733d8f1c801b955974a8 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 3 Apr 2013 15:01:44 -0400
Subject: fix merge conflict error causing the $cluster parameter to go missing

---
 manifests/init.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/init.pp')

diff --git a/manifests/init.pp b/manifests/init.pp
index a08fb0a..872e5f2 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,7 +17,7 @@
 
 # TODO: warn on cert/key issues, fail on false accept?
 
-class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '' )
+class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra = '', $cluster = '' )
 {
 
   case $::operatingsystem {
-- 
cgit v1.2.3