Skip to content

Commit 15af0c0

Browse files
Merge pull request #67 from enxebre/revendor
Bug 1752088: UPSTREAM: <carry>: openshift: Revendor to bring openshift/cluster-api#72
2 parents 0032e55 + 932e0f2 commit 15af0c0

File tree

19 files changed

+860
-86
lines changed

19 files changed

+860
-86
lines changed

Gopkg.lock

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/openshift/cluster-api/Gopkg.lock

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

vendor/github.com/openshift/cluster-api/Gopkg.toml

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

vendor/github.com/openshift/cluster-api/Makefile

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/openshift/cluster-api/config/crds/machine_v1beta1_machine.yaml

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

vendor/github.com/openshift/cluster-api/config/crds/machine_v1beta1_machineset.yaml

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

vendor/github.com/openshift/cluster-api/hack/goimports.sh

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

vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machine_types.go

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

vendor/github.com/openshift/cluster-api/pkg/apis/machine/v1beta1/machineset_types.go

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

vendor/github.com/openshift/cluster-api/pkg/controller/BUILD.bazel

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

0 commit comments

Comments
 (0)