Merge remote-tracking branch 'shared/master'

Conflicts:
	manifests/init.pp
This commit is contained in:
mh 2013-01-02 12:23:49 +01:00
commit bac64e7595

View file

@ -1,6 +1,6 @@
class lsb { class lsb {
case $::operatingsystem { case $::operatingsystem {
debian: { include lsb::debian } debian,ubuntu: { include lsb::debian }
centos: { include lsb::centos } centos: { include lsb::centos }
} }
} }