aboutsummaryrefslogtreecommitdiff
path: root/manifests/ubuntu
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:01:11 -0300
commitdffe0d74eadc7c25ab9ee513cb3a6b345dfa7644 (patch)
tree53e848d9d576687ec2c032564b6c42ba21b678f1 /manifests/ubuntu
parent589f5723d500ad7325e19dfeb1d3b8450044acf1 (diff)
parentedd5db0159d5075609c545fb3ee10727a1cf5271 (diff)
downloadpuppet-shorewall-master.tar.gz
puppet-shorewall-master.tar.bz2
Merge remote-tracking branch 'shared/master' into developHEADmaster
Conflicts: manifests/tunnel.pp
Diffstat (limited to 'manifests/ubuntu')
-rw-r--r--manifests/ubuntu/karmic.pp5
1 files changed, 0 insertions, 5 deletions
diff --git a/manifests/ubuntu/karmic.pp b/manifests/ubuntu/karmic.pp
deleted file mode 100644
index 0df3789..0000000
--- a/manifests/ubuntu/karmic.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-class shorewall::ubuntu::karmic inherits shorewall::debian {
- Package['shorewall']{
- name => 'shorewall-shell',
- }
-}