Skip to content

Commit

Permalink
Merge pull request #116 from elmiko/mao-update-e0db6b65
Browse files Browse the repository at this point in the history 
Bug 1878880: re-vendor machine-api-operator at e0db6b65
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Sep 24, 2020
2 parents bb0a54c + 96f74b4 commit 2e9d7d7
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/go-logr/zapr v0.2.0 // indirect
github.com/metal3-io/baremetal-operator v0.0.0-00010101000000-000000000000
github.com/onsi/gomega v1.10.1
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.5.1
golang.org/x/net v0.0.0-20200707034311-ab3426394381
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200527204437-14e5e0c7d862/g
github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd/go.mod h1:6vMi+R3xqznBdq5rgeal9N3ak3sOpy50t0fdRCcQXjE=
github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628/go.mod h1:cxjy/RUzv5C2T5FNl1KKXUgtakWsezWQ642B/CD9VQA=
github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7/go.mod h1:XDsNRAVEJtkI00e51SAZ/PnqNJl1zv0rHXSdl9L1oOY=
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 h1:XA1F/7MliCpUMZ1llUAE2R5tDvQSTtRb96HV726f3+Y=
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U=
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 h1:w50MvkvZPOx30R3wMvSPRRJsPipxM82Ny9mY67DnpDk=
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U=
github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII=
github.com/openshift/prom-label-proxy v0.1.1-0.20191016113035-b8153a7f39f1/go.mod h1:p5MuxzsYP1JPsNGwtjtcgRHHlGziCJJfztff91nNixw=
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/openshift/machine-api-operator/Dockerfile.rhel
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machine_webhook.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/openshift/machine-api-operator/pkg/controller/machine/controller.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ github.com/openshift/client-go/config/clientset/versioned/scheme
github.com/openshift/client-go/config/clientset/versioned/typed/config/v1
# github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200901173901-9056dbc8c9b9
github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1
# github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12
# github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71
github.com/openshift/machine-api-operator
github.com/openshift/machine-api-operator/pkg/apis/machine
github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1
Expand Down

0 comments on commit 2e9d7d7

Please sign in to comment.