summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2013-01-02 12:23:49 +0100
committermh <mh@immerda.ch>2013-01-02 12:23:49 +0100
commitbac64e7595a6d4f8d409b024a26bddb1c06188d6 (patch)
tree6f09d1b439fca07bd03a6375440a1233282b22eb
parent23660f8e9253ceafa89bd8ae568bf93c5b6c6619 (diff)
parent3742c1a00c5602154a81834443ec5b0ca32c4ca0 (diff)
Merge remote-tracking branch 'shared/master'HEADmaster
Conflicts: 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 312e0b8..85b34e1 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,6 @@
class lsb {
case $::operatingsystem {
- debian: { include lsb::debian }
+ debian,ubuntu: { include lsb::debian }
centos: { include lsb::centos }
}
}