]> gitweb.fluxo.info Git - puppet-apt.git/commitdiff
projects / puppet-apt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ee15eb5 c38be6c)
Merge branch 'master' of ssh://labs.riseup.net/shared-apt
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 20 May 2013 21:08:15 +0000 (18:08 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 20 May 2013 21:08:15 +0000 (18:08 -0300)
Conflicts:
manifests/init.pp

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

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