projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 28f1931 66bd744)
Merge branch 'devel-2.4'
authorMichael Hanselmann <hansmi@google.com>
Wed, 1 Jun 2011 16:10:06 +0000 (18:10 +0200)
committerMichael Hanselmann <hansmi@google.com>
Wed, 1 Jun 2011 17:08:55 +0000 (19:08 +0200)
commit07346f28e6da2c7f2c230065407dc459717b8ed2
tree98f6e941cfbe30875752e5932c70b0c26aed793ftree | snapshot
parent28f193131965b0bc73edadd188e3c8f1caa63a87commit | diff
parent66bd7445ed6e1e7200c28d0dfd42ba1365352eb2commit | diff
Merge branch 'devel-2.4'

* devel-2.4:
  jqueue: Fix potential race condition when cancelling queued jobs
  Fix argument order in ReserveLV and ReserveMAC

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
lib/config.py diff1 | diff2 | blob | history
lib/jqueue.py diff1 | diff2 | blob | history
test/ganeti.jqueue_unittest.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.