Merge Master in geni-v3 conflict resolution

[sfa.git] / sfa / rspecs / elements / node.py

diff --git a/sfa/rspecs/elements/node.py b/sfa/rspecs/elements/node.py
index 26fcfdd..e0f65e4 100644 (file)
--- a/sfa/rspecs/elements/node.py
+++ b/sfa/rspecs/elements/node.py
@@ -3,6 +3,7 @@ from sfa.rspecs.elements.element import Element
 class NodeElement(Element):
     
     fields = [
+        'client_id',
         'component_id',
         'component_name',
         'component_manager_id',