]> gitweb.fluxo.info Git - puppet-apt.git/commit
projects / puppet-apt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c43bfac 5bf01f1)
Merge remote branch 'nadir/master'
authorintrigeri <intrigeri@boum.org>
Wed, 10 Nov 2010 09:11:18 +0000 (10:11 +0100)
committerintrigeri <intrigeri@boum.org>
Wed, 10 Nov 2010 09:19:06 +0000 (10:19 +0100)
commit2cd9496999af2dd00a203f38c4e1f4393c7f3f62
treea74f18ccf51d7f48752b37d3a8f39705972eac05tree | snapshot
parentc43bfac6b80489cf789fe448abb3561a6655a969commit | diff
parent5bf01f148d2c2db8523febc0d73591444c5965c9commit | diff
Merge remote branch 'nadir/master'

Conflicts:
README
manifests/custom_sources.pp
manifests/default_preferences.pp
manifests/init.pp
manifests/unattended_upgrades.pp
templates/Debian/sources.list.volatile.erb
README diff1 | diff2 | blob | history
manifests/init.pp diff1 | diff2 | blob | history
manifests/preferences.pp | diff2 | blob | history
Puppet module for apt