From: Guido Trotter <ultrotter@google.com>
Date: Fri, 26 Feb 2010 14:15:25 +0000 (+0100)
Subject: Merge branch 'stable-2.1' into devel-2.1
X-Git-Tag: v2.1.1~50
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/467c10781cc3f183ade69312e1bfc8618e49dac4

Merge branch 'stable-2.1' into devel-2.1

* stable-2.1:
  Add NLD constants to Ganeti
  Fix two potentially endless loops in http library
  Fix bug in LUQueryConfigValues
  Fix typo in LUVerifyCluster when checking node time

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---

467c10781cc3f183ade69312e1bfc8618e49dac4