From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 23 Mar 2012 12:59:51 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap
X-Git-Tag: userdir-ldap-0.3.85~65
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=a8cec059917fb8daada42441329cadf9a89e82be

Merge branch 'master' of git+ssh://db.debian.org/git/userdir-ldap

* 'master' of git+ssh://db.debian.org/git/userdir-ldap: (21 commits)
  ud-generate: lock replicators
  Set generate_dir in the non-override case
  Get lock sooner, connect to ldap later
  flocks do not need freeing
  Profile if UD_PROFILE is in environment
  No need to depend on python-lockfile anymore
  Use flock()
  Use eatmydata!
  UDLdap.py: make a cache for __getitem__() decisions.
  No need to mkdir userkeys directory anymore
  get rid of global state variable CurrentHost.  This will enable upcoming changes.
  GenerateDir is no longer a global var
  minor nit
  speed up ssh tarball generation
  ud-generate speed, I
  ud-generate: Move main code into a ud_generate()
  ud-generate: Add -f option to build even if cache is current
  ud-generate: Move code into getLastBuildTime() and getLastLDAPChangeTime() functions.
  ud-generate: No longer expand $ in dnsZoneEntry data to a \n\t.
  changelog entry for ud-mailgate fix
  ...
---

a8cec059917fb8daada42441329cadf9a89e82be