projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df5a573 1316ebc)
Merge branch 'stable-2.5' into devel-2.5
authorMichael Hanselmann <hansmi@google.com>
Thu, 22 Dec 2011 16:35:03 +0000 (17:35 +0100)
committerMichael Hanselmann <hansmi@google.com>
Thu, 22 Dec 2011 16:41:37 +0000 (17:41 +0100)
* stable-2.5:
  jqueue: Fix epylint errors introduced in 37d76f1e4
  jqueue: Fix deadlock between job queue and dependency manager

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

1  2 
lib/jqueue.py patch | diff1 | diff2 | blob | history
test/ganeti.jqueue_unittest.py patch | diff1 | diff2 | blob | history

diff --cc lib/jqueue.py
Simple merge
diff --cc test/ganeti.jqueue_unittest.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.