github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15596 from zhengguoyong/alias_util_errors_packagename

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-19 02:35:37 -07:00
parent 44a9877bd4 f8f9afb874
commit 75c977d200
29 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/proxy/userspace/proxier.go
View File

@@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/pkg/proxy"
"k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/util/errors"
utilerrors "k8s.io/kubernetes/pkg/util/errors"
"k8s.io/kubernetes/pkg/util/iptables"
)
@@ -647,7 +647,7 @@ func (proxier *Proxier) closePortal(service proxy.ServicePortName, info *service
} else {
glog.Errorf("Some errors closing iptables portals for service %q", service)
}
return errors.NewAggregate(el)
return utilerrors.NewAggregate(el)
}
func (proxier *Proxier) closeOnePortal(portal portal, protocol api.Protocol, proxyIP net.IP, proxyPort int, name proxy.ServicePortName) []error {
@@ -819,7 +819,7 @@ func iptablesFlush(ipt iptables.Interface) error {
if len(el) != 0 {
glog.Errorf("Some errors flushing old iptables portals: %v", el)
}
return errors.NewAggregate(el)
return utilerrors.NewAggregate(el)
}
// Used below.