]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08b066d d51e2af)
Merge remote-tracking branch 'remotes/origin/master' into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 3 Mar 2013 08:26:49 +0000 (09:26 +0100)
committervarac <varacanero@zeromail.org>
Sun, 3 Mar 2013 08:26:49 +0000 (09:26 +0100)
Conflicts:
README
files/50unattended-upgrades
files/lenny/50unattended-upgrades
files/squeeze/50unattended-upgrades
manifests/dist_upgrade.pp
manifests/init.pp
manifests/upgrade_package.pp


Trivial merge
Puppet module for apt