Skip to content

Commit f5ef0d5

Browse files
author
OpenShift Bot
authored
Merge pull request #12600 from smarterclayton/bump_etcd_310
Merged by openshift-bot
2 parents fac9b78 + e22997b commit f5ef0d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+5897
-4083
lines changed

‎Godeps/Godeps.json

Lines changed: 143 additions & 129 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/sdn/plugin/pod_unsupported.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ package plugin
55
import (
66
"fmt"
77

8-
"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
9-
10-
kubehostport "k8s.io/kubernetes/pkg/kubelet/network/hostport"
11-
128
cnitypes "github.com/containernetworking/cni/pkg/types"
9+
10+
"github.com/openshift/origin/pkg/sdn/plugin/cniserver"
1311
)
1412

1513
func (m *podManager) setup(req *cniserver.PodRequest) (*cnitypes.Result, *runningPod, error) {

0 commit comments

Comments
 (0)