Skip to content

Commit 1811198

Browse files
Merge pull request #124 from elmiko/mao-update-e0db6b65
Bug 1878880: re-vendor machine-api-operator at e0db6b65
2 parents d092eee + 6cb8f44 commit 1811198

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/gophercloud/utils v0.0.0-20190124231947-9c3b9f2457ef
1414
github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
1515
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
16-
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12
16+
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71
1717
github.com/vincent-petithory/dataurl v0.0.0-20160330182126-9a301d65acbb // indirect
1818
go4.org v0.0.0-20191010144846-132d2879e1e9 // indirect
1919
gopkg.in/yaml.v2 v2.3.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200611014855-9a69f85c32dd/g
435435
github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628 h1:8ErZADoEg3XJBqY8tM9eUEJ9szb7jQHNHSlw2j9Gr5Y=
436436
github.com/openshift/machine-api-operator v0.2.1-0.20200701225707-950912b03628/go.mod h1:cxjy/RUzv5C2T5FNl1KKXUgtakWsezWQ642B/CD9VQA=
437437
github.com/openshift/machine-api-operator v0.2.1-0.20200722104429-f4f9b84df9b7/go.mod h1:XDsNRAVEJtkI00e51SAZ/PnqNJl1zv0rHXSdl9L1oOY=
438-
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12 h1:XA1F/7MliCpUMZ1llUAE2R5tDvQSTtRb96HV726f3+Y=
439-
github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U=
438+
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71 h1:w50MvkvZPOx30R3wMvSPRRJsPipxM82Ny9mY67DnpDk=
439+
github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71/go.mod h1:SA92GU0BSLwmjwD9rL2OTXiRmcSMhgYPw5RXH4OuM4U=
440440
github.com/operator-framework/operator-sdk v0.5.1-0.20190301204940-c2efe6f74e7b/go.mod h1:iVyukRkam5JZa8AnjYf+/G3rk7JI1+M6GsU0sq0B9NA=
441441
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
442442
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=

vendor/github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1/machine_webhook.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/machine-api-operator/pkg/controller/machine/controller.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/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ github.com/openshift/client-go/config/clientset/versioned/scheme
161161
github.com/openshift/client-go/config/clientset/versioned/typed/config/v1
162162
# github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200901173901-9056dbc8c9b9
163163
github.com/openshift/cluster-api-provider-gcp/pkg/apis/gcpprovider/v1beta1
164-
# github.com/openshift/machine-api-operator v0.2.1-0.20200910172650-cac610d67c12
164+
# github.com/openshift/machine-api-operator v0.2.1-0.20200922150054-e0db6b65ba71
165165
github.com/openshift/machine-api-operator/pkg/apis/machine
166166
github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1
167167
github.com/openshift/machine-api-operator/pkg/apis/vsphereprovider/v1beta1

0 commit comments

Comments
 (0)