afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'core-future' into core-rest-flask

Browse source
This commit is contained in:
Blake J. Harnden 2018-04-30 16:28:42 -07:00
commit 9b90ee8917
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/broker.py
View file

@ -1163,5 +1163,5 @@ class CoreBroker(ConfigurableManager):
control_nets = map(lambda x: "%s:%s" % (x[0], x[1]), zip(servers, control_nets)) control_nets = map(lambda x: "%s:%s" % (x[0], x[1]), zip(servers, control_nets))
values[index] = "controlnet=%s" % (" ".join(control_nets)) values[index] = "controlnet=%s" % (" ".join(control_nets))
values_str = "|".join(values) values_str = "|".join(values)
message.tlvdata[ConfigTlvs.VALUES.value] = values_str message.tlv_data[ConfigTlvs.VALUES.value] = values_str
message.repack() message.repack()

1
daemon/core/future/coreemu.py
View file

@ -856,7 +856,6 @@ class CoreEmu(object):
self.sessions = {} self.sessions = {}
# set default nodes # set default nodes
# set default node map
node_map = nodemaps.NODES node_map = nodemaps.NODES
nodeutils.set_node_map(node_map) nodeutils.set_node_map(node_map)