Fix merge error (missing Network.labels attribute)

Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-18 14:09:31 -07:00 · 2016-10-18 14:09:31 -07:00 · cd94c37f5d
commit cd94c37f5d
parent efb09af271
1 changed files with 1 additions and 0 deletions
--- a/compose/network.py
+++ b/compose/network.py
@ -26,6 +26,7 @@ class Network(object):
        self.external_name = external_name
        self.internal = internal
        self.enable_ipv6 = enable_ipv6
+        self.labels = labels

    def ensure(self):
        if self.external_name: