Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 573554c

Browse files
aaronlevyaaronlevy
authored
Merge pull request #101 from aaronlevy/vendor-v1.3.4
Vendor v1.3.4
2 parents 5cc9838 + d244586 commit 573554c

File tree

144 files changed

+5671
-1831
lines changed

Some content is hidden

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

144 files changed

+5671
-1831
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ conformance-%: clean all
5050

5151
# This will naively try and create a vendor dir from a k8s release
5252
# USE: make vendor VENDOR_VERSION=vX.Y.Z
53-
VENDOR_VERSION = v1.3.0
53+
VENDOR_VERSION = v1.3.4+coreos.0
5454
vendor: vendor-$(VENDOR_VERSION)
5555

5656
vendor-$(VENDOR_VERSION):
5757
@echo "Creating k8s vendor dir: $@"
5858
@mkdir -p $@/k8s.io/kubernetes
59-
@git clone --branch=$(VENDOR_VERSION) --depth=1 https://github.com/kubernetes/kubernetes $@/k8s.io/kubernetes > /dev/null 2>&1
59+
@git clone --branch=$(VENDOR_VERSION) --depth=1 https://github.com/coreos/kubernetes $@/k8s.io/kubernetes > /dev/null 2>&1
6060
@cd $@/k8s.io/kubernetes && git checkout $(VENDOR_VERSION) > /dev/null 2>&1
6161
@cd $@/k8s.io/kubernetes && rm -rf docs examples hack cluster Godeps
6262
@cd $@/k8s.io/kubernetes/vendor && mv k8s.io/heapster $(abspath $@/k8s.io) && rmdir k8s.io

‎vendor/github.com/docker/engine-api/client/container_logs.go‎

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

‎vendor/github.com/docker/engine-api/client/image_load.go‎

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

‎vendor/github.com/docker/engine-api/client/image_pull.go‎

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

‎vendor/github.com/docker/engine-api/client/image_push.go‎

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

‎vendor/github.com/docker/engine-api/client/image_search.go‎

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

‎vendor/github.com/docker/engine-api/types/client.go‎

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

‎vendor/github.com/docker/engine-api/types/container/host_config.go‎

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

‎vendor/github.com/docker/engine-api/types/reference/image_reference.go‎

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

‎vendor/github.com/docker/engine-api/types/registry/registry.go‎

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)