Merge v1.2.3 master

2017-05-03 23:24:53 +02:00 · 2017-05-03 23:24:53 +02:00 · 4e186cecf9
commit 4e186cecf9
parent 8ac281f9e3
2 changed files with 4 additions and 1 deletions
--- a/provider/docker/service_test.go
+++ b/provider/docker/service_test.go
@ -133,7 +133,7 @@ func TestDockerGetServiceFrontendRule(t *testing.T) {
 	}{
 		{
 			container: containerJSON(name("foo")),
-			expected:  "Host:foo.",
+			expected:  "",
 		},
 		{
 			container: containerJSON(labels(map[string]string{