Merge pull request #63 from docker/staging

1.4.2

Author: Feng Honglin

haproxy/__init__.py

@@ -1 +1 @@
-__version__ = "1.4"
+__version__ = "1.4.2"

haproxy/parser/base_parser.py

@@ -25,7 +25,10 @@ def _merge_services_with_same_vhost(self):
             del self.details[service_alias]
 
             for route in self.routes[service_alias]:
-                self.routes[services_with_same_vhost[service_alias]].append(route)
+                if services_with_same_vhost[service_alias] not in self. routes:
+                    self.routes[services_with_same_vhost[service_alias]] = [route]
+                else:
+                    self.routes[services_with_same_vhost[service_alias]].append(route)
             del self.routes[service_alias]
 
             vhosts = []