X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=879b6ed25cb29421be483eaf6f8846b3b032ccc4;hb=316986ff5d1de5697b73f839158f183f89a77d88;hp=f0568930ee6b615834eefe6b6c75371ad90d3af2;hpb=e12a707f716a882823b274e4a558bdcc348fffbf;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index f0568930..879b6ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2008-11-23  Joerg Jaspert  <joerg@debian.org>
+
+	* dak/process_unchecked.py (check_files): fix this armel mess
+
+	* config/debian-security/dak.conf: Set ValidTime
+
+	* config/debian-security/cron.weekly: Added
+
+2008-11-17  Joerg Jaspert  <joerg@debian.org>
+
+	* dak/security-install.py: Removed, no longer in use.
+
+2008-11-16  Joerg Jaspert  <joerg@debian.org>
+
+	* scripts/debian/mkfilesindices: useless typical, doesnt have
+	i18n/ dirs. Force them in (i hope).
+
+2008-11-15  Thomas Viehmann <tv@beamnet.de>
+
+	* dak/show_deferred.py: handle uploads that do not close bugs
+
+2008-11-11  Joerg Jaspert  <joerg@debian.org>
+
+	* config/debian/dak.conf: good bye oldstable/o-p-u
+
+2008-11-10  Joerg Jaspert  <joerg@debian.org>
+
+	* config/debian/cron.unchecked: how about us ignoring bugs.d.o
+	down? It's not like it is time critical or something to transfer
+	this stuff, it doesn't hurt to have it there a bit later...
+
 2008-11-08  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/cron.hourly: Create new tracefile format.
@@ -547,6 +578,7 @@
 	* dak/stats.py: likewise
 	* dak/symlink_dists.py: likewise
 	* dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>