From 5ba35653d86f80baed5ff8db260d477d15fb745f Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 7 Feb 2013 15:47:48 +0100
Subject: [PATCH] Make ParticalNic's network field of type String

This was applied to "master" along with extra changes affecting the
master branch only. Cherry-picking just the Objects.hs change.

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 src/Ganeti/Objects.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs
index f86b54d35..b0fd163d4 100644
--- a/src/Ganeti/Objects.hs
+++ b/src/Ganeti/Objects.hs
@@ -212,7 +212,7 @@ $(buildObject "PartialNic" "nic"
   [ simpleField "mac" [t| String |]
   , optionalField $ simpleField "ip" [t| String |]
   , simpleField "nicparams" [t| PartialNicParams |]
-  , optionalField $ simpleField "network" [t| Network |]
+  , optionalField $ simpleField "network" [t| String |]
   ])
 
 -- * Disk definitions
-- 
GitLab