From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 3 Oct 2018 07:10:59 +0000 (+0200)
Subject: Merge remote-tracking branch 'aerostitch/update_welcome_email'
X-Git-Tag: userdir-ldap-0.3.93~12
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=d1ef90f03b000b099331f7cb478e293576ef726c;hp=ded9a82b901b9784d9ac5343c598b409f23fa060

Merge remote-tracking branch 'aerostitch/update_welcome_email'

* aerostitch/update_welcome_email:
  Change references from alioth to salsa in the DD welcome email
---

diff --git a/debian/changelog b/debian/changelog
index 2f7548c..4a3889a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ userdir-ldap (0.3.93) UNRELEASED; urgency=medium
   * Also export a host's SSHFP records to additional dns names
     (sshfpHostname).
   * UDLdap.py: more useful exception if our array assumptions are violated.
+  * ud-guest-upgrade: do not add but replace privateSub.
 
   [ Ansgar Burchardt ]
   * ud-mailgate: include name of unknown host in error message