summaryrefslogtreecommitdiff
path: root/manifests/init.pp
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-04-03 15:01:44 -0400
committerMicah Anderson <micah@riseup.net>2013-04-03 15:01:44 -0400
commitd7acd567ace308049848733d8f1c801b955974a8 (patch)
tree2d96270a1c428b69f7839ab124064e3c9ebff3c0 /manifests/init.pp
parentc3d3f81b98542b94a013440c81b0942c9c4a82cf (diff)
fix merge conflict error causing the $cluster parameter to go missing
Diffstat (limited to 'manifests/init.pp')
-rw-r--r--manifests/init.pp2
1 files changed, 1 insertions, 1 deletions
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 {