Merge pull request #19334 from resouer/network

Networking should be used to hold network related pkgs
This commit is contained in:
Alex Mohr
2016-01-21 10:26:13 -08:00
43 changed files with 687 additions and 626 deletions

View File

@@ -33,7 +33,7 @@ import (
"golang.org/x/net/context"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource"
"k8s.io/kubernetes/pkg/util"
utilnet "k8s.io/kubernetes/pkg/util/net"
)
const defaultClusterName = "mesos"
@@ -111,7 +111,7 @@ func newMesosClient(
md detector.Master,
mesosHttpClientTimeout, stateCacheTTL time.Duration) (*mesosClient, error) {
tr := util.SetTransportDefaults(&http.Transport{})
tr := utilnet.SetTransportDefaults(&http.Transport{})
httpClient := &http.Client{
Transport: tr,
Timeout: mesosHttpClientTimeout,