]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0425c6 8c8bd7b)
Merge remote-tracking branch 'shared/master' into develop develop master
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 31 Mar 2016 17:50:07 +0000 (14:50 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 31 Mar 2016 17:50:07 +0000 (14:50 -0300)
Conflicts:
README
files/Debian/50unattended-upgrades.lenny
files/Debian/50unattended-upgrades.wheezy
manifests/init.pp
manifests/params.pp
manifests/unattended_upgrades.pp
templates/Debian/preferences_jessie.erb
templates/Debian/sources.list.erb


Trivial merge
Puppet module for apt