]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 20 Feb 2015 21:15:02 +0000 (16:15 -0500)
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>
Fri, 20 Feb 2015 21:15:02 +0000 (16:15 -0500)
commit8ed07cac2f084bfe542f4978daa783aedd7e79b4
tree93020168f8979b317c3a7c93e2b8ec154078385a
parente3e0b46ca6039170c2d2faa8b2bebf14460679eb
parent53e78e61fefefe85939a3c3b5efcd147deebca61
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt

Conflicts:
templates/Debian/sources.list.erb
manifests/init.pp
templates/Debian/sources.list.erb