Merge pull request #62 from joshwget/v1.7.0-rancher

v1.7.0-rancher
rancher · Jul 1, 2017 · 57d812e · 57d812e
2 parents d3ada01 + 358d6f3
commit 57d812e
Show file tree

Hide file tree

Showing 319 changed files with 27,075 additions and 333 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/cloudprovider/providers/providers.go b/pkg/cloudprovider/providers/providers.go
@@ -27,5 +27,6 @@ import (
 	_ "k8s.io/kubernetes/pkg/cloudprovider/providers/ovirt"
 	_ "k8s.io/kubernetes/pkg/cloudprovider/providers/photon"
 	_ "k8s.io/kubernetes/pkg/cloudprovider/providers/rackspace"
+	_ "k8s.io/kubernetes/pkg/cloudprovider/providers/rancher"
 	_ "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere"
 )