]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f823fcd 4f433db)
Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Thu, 16 Aug 2012 07:35:21 +0000 (09:35 +0200)
committermh <mh@immerda.ch>
Thu, 16 Aug 2012 07:35:21 +0000 (09:35 +0200)
Conflicts:
README
manifests/dist_upgrade/initiator.pp
manifests/init.pp
manifests/preseeded_package.pp
manifests/unattended_upgrades.pp

1  2 
README patch | diff1 | diff2 | blob | history

diff --cc README
Simple merge
Puppet module for apt