Merge branch 'v1.4' into master

2017-09-21 11:12:39 +02:00
parent 837db9a2d9 a941739f8a
commit d6ef8ec3d1
7 changed files with 68 additions and 48 deletions
--- a/integration/consul_catalog_test.go
+++ b/integration/consul_catalog_test.go
@@ -261,6 +261,7 @@ func (s *ConsulCatalogSuite) TestRefreshConfigWithMultipleNodeWithoutHealthCheck

 	err = s.registerAgentService("test", nginx.NetworkSettings.IPAddress, 80, []string{"name=nginx1"})
 	c.Assert(err, checker.IsNil, check.Commentf("Error registering agent service"))
+	defer s.deregisterAgentService(nginx.NetworkSettings.IPAddress)

 	req, err := http.NewRequest(http.MethodGet, "http://127.0.0.1:8000/", nil)
 	c.Assert(err, checker.IsNil)