projects / ganeti-local / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dde3b0d 32265e7)
Merge branch 'stable-2.8' into stable-2.9
authorKlaus Aehlig <aehlig@google.com>
Wed, 25 Sep 2013 11:53:24 +0000 (13:53 +0200)
committerKlaus Aehlig <aehlig@google.com>
Wed, 25 Sep 2013 12:07:01 +0000 (14:07 +0200)
* stable-2.8
  Add additional tests for utils.Retry
  Make retry tests independent of actual time
  Fix corner-case in handling of remaining retry time
  Perform proper cleanup on termination of Haskell daemons

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>

1  2 
src/Ganeti/Daemon.hs patch | diff1 | diff2 | blob | history

diff --cc src/Ganeti/Daemon.hs
Simple merge
Unnamed repository; edit this file 'description' to name the repository.