Merge pull request #12600 from smarterclayton/bump_etcd_310

Merged by openshift-bot
openshift · Jan 24, 2017 · f5ef0d5 · f5ef0d5
2 parents fac9b78 + e22997b
commit f5ef0d5
Show file tree

Hide file tree

Showing 100 changed files with 5,897 additions and 4,083 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/sdn/plugin/pod_unsupported.go b/pkg/sdn/plugin/pod_unsupported.go
@@ -5,11 +5,9 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
-
-	kubehostport "k8s.io/kubernetes/pkg/kubelet/network/hostport"
-
 	cnitypes "github.com/containernetworking/cni/pkg/types"
+
+	"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
 )
 
 func (m *podManager) setup(req *cniserver.PodRequest) (*cnitypes.Result, *runningPod, error) {