Merge pull request #448 from surajssd/vendor-update-3.6

Update the vendored Openshift to 3.6.1
kedgeproject · Nov 17, 2017 · 42f6691 · 42f6691
2 parents 2f1cf4e + b219f54
commit 42f6691
Show file tree

Hide file tree

Showing 108 changed files with 5,252 additions and 2,725 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/scripts/vendor-openshift.sh b/scripts/vendor-openshift.sh
@@ -12,7 +12,7 @@
 
 
 OPENSHIFT_REPO="https://github.com/openshift/origin"
-OPENSHIFT_VERSION="v3.6.0"
+OPENSHIFT_VERSION="v3.6.1"
 
 PROJECT_VENDOR="./vendor"
 

diff --git a/vendor/github.com/coreos/etcd/client/client.go b/vendor/github.com/coreos/etcd/client/client.go
diff --git a/vendor/github.com/google/cadvisor/manager/container.go b/vendor/github.com/google/cadvisor/manager/container.go
diff --git a/vendor/github.com/google/cadvisor/manager/manager.go b/vendor/github.com/google/cadvisor/manager/manager.go
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/apply_systemd.go
diff --git a/vendor/github.com/openshift/origin/Makefile b/vendor/github.com/openshift/origin/Makefile
diff --git a/vendor/github.com/openshift/origin/api/swagger-spec/openshift-openapi-spec.json b/vendor/github.com/openshift/origin/api/swagger-spec/openshift-openapi-spec.json