Merge pull request kubernetes#24595 from zhouhaibing089/httpserverclose

Automatic merge from submit-queue Uncomment the code that caused by kubernetes#19254 Fix kubernetes#24546. @lavalamp
zmerlynn · Apr 28, 2016 · d0b887e · d0b887e
2 parents 04b70bc + bf1a3f9
commit d0b887e
Show file tree

Hide file tree

Showing 53 changed files with 218 additions and 436 deletions.
diff --git a/contrib/mesos/pkg/scheduler/integration/integration_test.go b/contrib/mesos/pkg/scheduler/integration/integration_test.go
@@ -623,8 +623,7 @@ func (lt lifecycleTest) Start() <-chan LaunchedTask {
 }
 
 func (lt lifecycleTest) Close() {
-	// TODO: Uncomment when fix #19254
-	// lt.apiServer.server.Close()
+	lt.apiServer.server.Close()
 }
 
 func (lt lifecycleTest) End() <-chan struct{} {