Skip to content

Commit c9f44c1

Browse files
Merge pull request openshift#213 from ingvagabund/sync-cluster-api-0.1.0
Sync with openshift cluster-api 0.1.0 rebase
2 parents 0e9a428 + e2a31b8 commit c9f44c1

File tree

51 files changed

+421
-123
lines changed

Some content is hidden

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

51 files changed

+421
-123
lines changed

Gopkg.lock

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

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ required = [
3030

3131
[[override]]
3232
name = "github.com/openshift/cluster-api"
33-
branch = "openshift-4.2-cluster-api-0.0.0-alpha.4"
33+
branch = "openshift-4.2-cluster-api-0.1.0"
3434

3535
[[override]]
3636
name = "github.com/openshift/cluster-api-actuator-pkg"

vendor/github.com/openshift/cluster-api/CONTRIBUTING.md

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/Dockerfile

Lines changed: 1 addition & 1 deletion
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: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift/cluster-api/cmd/clusterctl/README.md

Lines changed: 13 additions & 5 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/cluster_v1alpha1_machine.yaml

Lines changed: 13 additions & 4 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/cluster_v1alpha1_machinedeployment.yaml

Lines changed: 5 additions & 5 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/cluster_v1alpha1_machineset.yaml

Lines changed: 14 additions & 5 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: 13 additions & 10 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_machinedeployment.yaml

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

0 commit comments

Comments
 (0)