Skip to content

Commit

Permalink
Merge pull request #62 from enxebre/revendor
Browse files Browse the repository at this point in the history
Bug 1752088: UPSTREAM: <carry>: openshift: Revendor to bring openshift/cluster-api#72
  • Loading branch information
openshift-merge-robot authored Sep 17, 2019
2 parents 9a7e40f + 1e01404 commit 602750a
Show file tree
Hide file tree
Showing 25 changed files with 137 additions and 6,088 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/google/uuid v1.1.1 // indirect
github.com/hashicorp/golang-lru v0.5.1 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8
github.com/openshift/cluster-api v0.0.0-20190917100308-655e2d6ccdd5
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 // indirect
github.com/pkg/errors v0.8.1
github.com/prometheus/client_golang v0.9.2 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ github.com/onsi/gomega v1.4.2 h1:3mYCb7aPxS/RU7TI1y4rkEn1oKmPRjNJLNEXgw7MH2I=
github.com/onsi/gomega v1.4.2/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8 h1:L3tal3e86m4sx7BHr4m2xO4MA43clI52GBLurB/Vdl8=
github.com/openshift/cluster-api v0.0.0-20190829140302-072f7d777dc8/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU=
github.com/openshift/cluster-api v0.0.0-20190917100308-655e2d6ccdd5 h1:r1srojcJfutWWqI++8p7j4xRX0n4e88nCBOqkIdYsa0=
github.com/openshift/cluster-api v0.0.0-20190917100308-655e2d6ccdd5/go.mod h1:mNsD1dsD4T57kV4/C6zTHke/Ro166xgnyyRZqkamiEU=
github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709 h1:zNBQb37RGLmJybyMcs983HfUfpkw9OTFD9tbBfAViHE=
github.com/pborman/uuid v0.0.0-20180906182336-adf5a7427709/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
Expand Down

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

61 changes: 0 additions & 61 deletions vendor/golang.org/x/sys/unix/mkasm_darwin.go

This file was deleted.

106 changes: 0 additions & 106 deletions vendor/golang.org/x/sys/unix/mkpost.go

This file was deleted.

Loading

0 comments on commit 602750a

Please sign in to comment.