]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf7a6a c38be6c)
Merge branch 'master' into leap
authorMicah Anderson <micah@riseup.net>
Sun, 26 May 2013 21:04:05 +0000 (17:04 -0400)
committerMicah Anderson <micah@riseup.net>
Sun, 26 May 2013 21:04:05 +0000 (17:04 -0400)
1  2 
manifests/init.pp patch | diff1 | diff2 | blob | history

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