From: Joerg Jaspert <joerg@debian.org>
Date: Sat, 23 May 2009 17:32:35 +0000 (+0200)
Subject: Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f91bf88c622b3020bb4fe9abc27b350e586e7c45;hp=7c40371fd5e818e0bad7edfa92267d663adf4993;p=dak.git

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak:
  Send the "transitions completed" mail to debian-devel instead of the RT.
---

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index a57efc8d..5e816d37 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -6,7 +6,7 @@ Dinstall
    };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "6070D3A1";
+   SigningKeyIds "55BE302B 6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a057c6fe..21509aae 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -7,7 +7,7 @@ Dinstall
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
-   SigningKeyIds "6070D3A1";
+   SigningKeyIds "55BE302B 6070D3A1";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";