summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-21 16:38:50 +0100
committerintrigeri <intrigeri@boum.org>2010-11-21 16:38:50 +0100
commit71d42350d1edb643a20e651a6c4ab965e6903305 (patch)
treee0928f5e4b9164528e6be3fd36efbf8256ddb09f /files
parentd30069c178ff2aff9154f65bd7dbf988c4d002f1 (diff)
parent1b0bc415977c1c8b49390e0cdb1361769e0fdbae (diff)
Merge commit '1b0bc415977c1c8b49390e0cdb1361769e0fdbae'.
Merging one more commit. Conflicts: files/preferences templates/Debian/sources.list.deb-src.erb templates/Debian/sources.list.volatile.erb templates/Ubuntu/sources.list.backports.erb templates/Ubuntu/sources.list.deb-src.erb
Diffstat (limited to 'files')
-rw-r--r--files/02show_upgraded3
-rw-r--r--files/03clean3
2 files changed, 6 insertions, 0 deletions
diff --git a/files/02show_upgraded b/files/02show_upgraded
index 870a3a9..eb046b2 100644
--- a/files/02show_upgraded
+++ b/files/02show_upgraded
@@ -1 +1,4 @@
+# This file is brought to you by Puppet
+# all local modifications will be overwritten
+
APT::Get::Show-Upgraded true;
diff --git a/files/03clean b/files/03clean
index 335823d..d878375 100644
--- a/files/03clean
+++ b/files/03clean
@@ -1 +1,4 @@
+# This file is brought to you by Puppet
+# all local modifications will be overwritten
+
DSelect::Clean auto;