]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dcbf507 355372f)
Merge branch 'nadir_issue_4227' into nadir_master
authorvarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 12:55:15 +0000 (14:55 +0200)
committervarac <varacanero@zeromail.org>
Sun, 14 Apr 2013 12:55:15 +0000 (14:55 +0200)
Conflicts:
manifests/unattended_upgrades.pp

1  2 
manifests/unattended_upgrades.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/unattended_upgrades.pp
Simple merge
Puppet module for apt