« Previous | Next » 

Revision aa66c183

IDaa66c183c9dde00186d821693a4d0ed363ec00d4
Parent fc4498e9, 4f44e311
Child 96a7481d

Added by Michael Hanselmann over 9 years ago

Merge branch 'devel-2.5'

  • devel-2.5:
    jqueue: Factorize checking job processor's result
    jqueue unittest: Rename simple fake-job class
    jqueue: Fix epylint errors introduced in 37d76f1e4
    jqueue: Fix deadlock between job queue and dependency manager
    locking: Add “__repr__” to SharedLock and PipeCondition
    daemon.GenericMain: Don't generate backtrace on conflicting daemons
    utils.io.WritePidFile: Improve error reporting
    utils.ListVisibleFiles: Hide “lost+found” directories
    Fix race condition in test for *FileID functions

Conflicts:
lib/utils/io.py: Trivial

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted