]> gitweb.fluxo.info Git - puppet-apt.git/commit
Merge remote branch 'nadir/master' into wip
authorintrigeri <intrigeri@boum.org>
Sat, 16 Oct 2010 23:57:55 +0000 (01:57 +0200)
committerintrigeri <intrigeri@boum.org>
Sat, 16 Oct 2010 23:57:55 +0000 (01:57 +0200)
commitbcfb35c969de53aa2972a9d2415be5a258a01be8
tree9666e083c5391235f97c86032e979973ef299ee6
parente2f80db7b76171e5945127e2fd42fb35043990fb
parenteae01000c1db8bcfa7de17b2a9a8370289b801bc
Merge remote branch 'nadir/master' into wip

Conflicts:
manifests/default_preferences.pp
manifests/default_sources_list.pp
manifests/init.pp
templates/Debian/sources.list.deb-src.erb
templates/Debian/sources.list.erb
templates/Debian/sources.list.volatile.erb
templates/Ubuntu/sources.list.erb
files/50unattended-upgrades
manifests/custom_sources.pp
manifests/default_preferences.pp
manifests/default_sources_list.pp
manifests/init.pp
manifests/unattended_upgrades.pp
templates/Ubuntu/sources.list.erb