X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=2c3036feaeafe00aca11e99f07803c2d674a7b7b;hb=25e143f4083d446ab4009560d7e119a22a23596c;hp=31085d640649ee71878fa746e66f7a157e4bbcd9;hpb=aa43d9d1dd9d440c22c86c93d195c1b2b15ce216;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 31085d64..2c3036fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-05  Joerg Jaspert  <joerg@debian.org>
+
+	* dak/new_security_install.py (_do_Approve): This sudo call
+	definitely wants the -H option.
+
 2008-11-01  Joerg Jaspert  <joerg@debian.org>
 
 	* dak/process_unchecked.py (check_files): Also check the
@@ -538,6 +543,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>