Merge pull request #15862 from adityadani/portworx

Automatic merge from submit-queue (batch tested with PRs 15862, 15781, 15944) Enable Portworx Storage Driver This change - Enables portworx storage driver through the kubernetes volume plugins API. - Reverts commit - dcb5eef - Removes the duplicate proto generation error.
openshift · Aug 30, 2017 · 4a85dec · 4a85dec
2 parents 7999046 + 128f452
commit 4a85dec
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/cmd/server/kubernetes/master/controller/volumes.go b/pkg/cmd/server/kubernetes/master/controller/volumes.go
@@ -1,11 +1,10 @@
 package controller
 
 import (
+	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 	"k8s.io/kubernetes/pkg/api/v1"
 	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/volume"
-
-	"github.com/openshift/origin/pkg/cmd/server/bootstrappolicy"
 )
 
 // newPersistentVolumeRecyclerPodTemplate provides a function which makes our recycler pod template for use in the kube-controller-manager

diff --git a/vendor/github.com/libopenstorage/openstorage/api/api.pb.go b/vendor/github.com/libopenstorage/openstorage/api/api.pb.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/plugins.go
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/plugins.go