Merge pull request #1198 from jangie/revert-1080

Revert "Ensure that we don't add balancees with no health check runs …
2017-02-27 21:59:47 +01:00
parent a7d5e6ce4f 343e0547df
commit 89700666b9
2 changed files with 1 additions and 4 deletions
--- a/provider/marathon.go
+++ b/provider/marathon.go
@@ -264,9 +264,6 @@ func (provider *Marathon) taskFilter(task marathon.Task, applications *marathon.
 					return false
 				}
 			}
-		} else {
-			log.Debugf("Filtering marathon task %s with defined healthcheck as no healthcheck has run yet", task.AppID)
-			return false
 		}
 	}
 	return true
--- a/provider/marathon_test.go
+++ b/provider/marathon_test.go
@@ -629,7 +629,7 @@ func TestMarathonTaskFilter(t *testing.T) {
 					},
 				},
 			},
-			expected:         false,
+			expected:         true,
 			exposedByDefault: true,
 		},
 		{