Skip to content

Commit

Permalink
UPSTREAM: <carry>: openshift: Bug 1878880: re-vendor machine-api-oper…
Browse files Browse the repository at this point in the history 
…ator at e0db6b65

This change is being proposed to pick up the recent log message changes
as proposed in
openshift/machine-api-operator#681
  • Loading branch information
@elmiko
elmiko committed Sep 22, 2020
1 parent 5862e3d commit c5f8c4e
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Expand Up @@ -13,7 +13,7 @@ require (
github.com/onsi/ginkgo v1.12.1
github.com/onsi/gomega v1.10.1
github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
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/spf13/cobra v1.0.0
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Expand Up @@ -443,8 +443,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd/g
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 h1:jeLZ5Ng+Ri42dbZveN1ofrrRsUnYusauzeXPDTnXQfE=
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/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b/go.mod h1:iVyukRkam5JZa8AnjYf+/G3rk7JI1+M6GsU0sq0B9NA=
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
Expand Down
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
Expand Up @@ -176,7 +176,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/pkg/apis/machine
github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1
github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1beta1
Expand Down

0 comments on commit c5f8c4e

Please sign in to comment.