Merge branch 'v2_final' into devel_switch_v2

This commit is contained in:
James Cammarata 2015-06-01 16:42:59 -05:00
commit fe41f109a9
22 changed files with 255 additions and 121 deletions

View file

@ -59,11 +59,9 @@ class Group:
depth=self.depth,
)
debug("serializing group, result is: %s" % result)
return result
def deserialize(self, data):
debug("deserializing group, data is: %s" % data)
self.__init__()
self.name = data.get('name')
self.vars = data.get('vars', dict())