Skip to content
Snippets Groups Projects
Commit aa66c183 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

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 37d76f1e
  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: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parents fc4498e9 4f44e311
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment