From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 1 Nov 2008 19:47:37 +0000 (+0100)
Subject: Merge branch 'master' into security
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=30b1d57ed3df70b938f29044742ecae59c570d99;hp=-c;p=dak.git

Merge branch 'master' into security

* master:
  defaultsuite stuff
---

30b1d57ed3df70b938f29044742ecae59c570d99
diff --combined ChangeLog
index 8c7ce8a4,31085d64..730146e4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,11 +1,11 @@@
+ 2008-11-01  Joerg Jaspert  <joerg@debian.org>
+ 
+ 	* dak/process_unchecked.py (check_files): Also check the
+ 	upload_suite for uploads. I guess we could kill the default_suite
+ 	totally, but for now we just look into the upload_suite one too.
+ 
+ 	* config/debian-security/dak.conf: Let DefaultSuite be stable
+ 
  2008-10-27  Joerg Jaspert  <joerg@debian.org>
  
  	* scripts/debian/mkfilesindices: Remove oldstable
@@@ -530,7 -538,6 +538,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>