[Da-tools-commits] ./debian/userdir-ldap r368: A nop with something behind it.

[Peter Palfrader]

------------------------------------------------------------
revno: 368
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Thu 2008-01-10 15:33:50 +0100
message:
  A nop with something behind it.
  
  Merge in r361 from alioth-common, the shiftUID patch, but also
  cherry pick r377 which reverts it (because it's incomplete/broken).
  
  This is necesary because bzr tracks what you merged so far and
  would always want to pull in 361 if I just skipped it now.
    ------------------------------------------------------------
    revno: 349.1.4.1.2
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-UIDShift+PasswordLessExport
    timestamp: Wed 2007-12-26 23:44:21 +0100
    message:
      Add 1000 to UIDs and GIDs if the ud-generate.conf contains '[UIDSHIFT]' as
      extra flag. This is useful if you want to preserve local accounts without
      ID conflicts.
    modified:
      ud-generate
    ------------------------------------------------------------
    revno: 349.1.4.1.3
    committer: Marc 'HE' Brockschmidt <he at debian.org>
    branch nick: userdir-ldap-UIDShift+PasswordLessExport
    timestamp: Thu 2007-12-27 09:39:32 +0100
    message:
      Sync with -common tree again
    modified:
      debian/changelog
      doc/slapd-config.txt
      gpgwrapper
      sigcheck
      ud-arbimport
      ud-echelon
      ud-emailmatcher
      ud-forwardlist
      ud-generate
      ud-gpgimport
      ud-gpgsigfetch
      ud-groupadd
      ud-homecheck
      ud-host
      ud-info
      ud-ldapshow
      ud-mailgate
      ud-passchk
      ud-roleadd
      ud-sshlist
      ud-useradd
      ud-userimport
      ud-xearth
      userdir_gpg.py
      userdir_ldap.py
    ------------------------------------------------------------
    revno: 349.1.12
    committer: Mark Hymers <mark at hymers.org.uk>
    branch nick: userdir-ldap-common
    timestamp: Thu 2007-12-27 12:50:36 +0000
    message:
      merge
    modified:
      ud-generate
-------------- next part --------------