]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d61a64b 52ebb41)
Merge remote branch 'lelutin/master'
authorMicah Anderson <micah@riseup.net>
Thu, 9 Dec 2010 14:44:00 +0000 (09:44 -0500)
committerMicah Anderson <micah@riseup.net>
Thu, 9 Dec 2010 14:44:00 +0000 (09:44 -0500)
1  2 
manifests/apt_conf.pp patch | diff1 | diff2 | blob | history

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