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:Michael Hanselmann <hansmi@google.com> Reviewed-by:
Iustin Pop <iustin@google.com>
Showing
- lib/daemon.py 6 additions, 1 deletionlib/daemon.py
- lib/errors.py 6 additions, 0 deletionslib/errors.py
- lib/jqueue.py 43 additions, 24 deletionslib/jqueue.py
- lib/locking.py 10 additions, 0 deletionslib/locking.py
- lib/utils/io.py 46 additions, 9 deletionslib/utils/io.py
- test/ganeti.jqueue_unittest.py 61 additions, 15 deletionstest/ganeti.jqueue_unittest.py
- test/ganeti.utils.io_unittest.py 39 additions, 2 deletionstest/ganeti.utils.io_unittest.py
Loading
Please register or sign in to comment