Commit 9c7a9846 authored by Daniele Venzano's avatar Daniele Venzano

Fix wrong conflict resolution

parent 826703f5
......@@ -186,7 +186,7 @@ class SwarmClient:
environment=environment,
hostname=service_instance.hostname,
labels=service_instance.labels,
mem_limit=service_instance.memory_limit,
mem_limit=mem_limit,
memswap_limit=service_instance.memory_limit,
name=service_instance.name,
networks=[get_conf().overlay_network_name],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment