From: Joerg Jaspert Date: Thu, 13 Nov 2008 06:59:00 +0000 (+0100) Subject: Merge branch 'master' into security X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=inline;h=006cbdd7669733c100b5ff59352c15591b11ff0f;hp=-c;p=dak.git Merge branch 'master' into security * master: dak.conf unchecked Create tracefile according to new format --- 006cbdd7669733c100b5ff59352c15591b11ff0f diff --combined ChangeLog index 2c3036fe,3c68e758..a2e9ed6e --- a/ChangeLog +++ b/ChangeLog @@@ -1,3 -1,17 +1,17 @@@ + 2008-11-11 Joerg Jaspert + + * config/debian/dak.conf: good bye oldstable/o-p-u + + 2008-11-10 Joerg Jaspert + + * 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 + + * config/debian/cron.hourly: Create new tracefile format. + 2008-11-05 Joerg Jaspert * dak/new_security_install.py (_do_Approve): This sudo call @@@ -543,7 -557,6 +557,7 @@@ * dak/stats.py: likewise * dak/symlink_dists.py: likewise * dak/transitions.py: likewise +>>>>>>> sec-merge:ChangeLog 2008-05-03 Joerg Jaspert