From: Klaus Aehlig <aehlig@google.com>
Date: Wed, 25 Sep 2013 11:53:24 +0000 (+0200)
Subject: Merge branch 'stable-2.8' into stable-2.9
X-Git-Tag: v2.9.0rc1~10
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/08d58f4cdfb574c3a6b0913bf8fab29d9685225a

Merge branch 'stable-2.8' into stable-2.9

* 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>
---

08d58f4cdfb574c3a6b0913bf8fab29d9685225a