projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d60bb1e 3c1a48c)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 10 Mar 2012 19:50:40 +0000 (20:50 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 10 Mar 2012 19:50:40 +0000 (20:50 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  add support for new trace file

Conflicts:
dsa-nagios-checks/checks/dsa-check-udldap-freshness


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.