Merge remote-tracking branch 'shared/master' master
authormh <mh@immerda.ch>
Wed, 2 Jan 2013 11:23:49 +0000 (12:23 +0100)
committermh <mh@immerda.ch>
Wed, 2 Jan 2013 11:23:49 +0000 (12:23 +0100)
Conflicts:
manifests/init.pp

1  2 
manifests/init.pp

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