Skip to content

Commit

Permalink
vendor: Bump hive to a050d77562a1ae37fc2358e047edef10623fc6f7
Browse files Browse the repository at this point in the history
I updated the import path to keep up with
openshift/hive@ae569e39 (Add make verify target, 2018-09-24,
openshift/hive#13).  Then I bumped vendor/ with:

  $ rm -rf ~/.glide/cache/info/https-github.com-openshift-hive.json ~/.glide/cache/src/https-github.com-openshift-hive/
  $ glide remove github.com/openshift/hive
  $ glide get --strip-vendor github.com/openshift/hive
  $ glide-vc --use-lock-file --no-tests --only-code
  $ git checkout HEAD -- vendor/github.com/shurcooL/httpfs

using:

  $ glide --version
  glide version 0.13.2-dev
  $ (cd $GOPATH/src/github.com/Masterminds/glide && git describe)
  v0.13.1-7-g3e13fd1
  $ (cd $GOPATH/src/github.com/sgotti/glide-vc && git describe)
  v0.1.0-2-g6ddf6ee

I don't	know why I needed to clear my cache, but without that
line the remaining commands didn't bump
vendor/github.com/openshift/hive to its current master.

Bumping to openshift/hive@a050d775 (Merge pull request
openshift/hive#28 from wking/tag-20-load-balancers-per-request,
2018-09-28) gives us more reliable load-balancer deletion.
  • Loading branch information
wking committed Sep 29, 2018
1 parent 8ff1cee commit b562fa3
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 31 deletions.
8 changes: 4 additions & 4 deletions glide.lock

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

5 changes: 1 addition & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,9 @@ import:
version: ^1.15.39
- package: github.com/libvirt/libvirt-go
version: ^v4.7.0
- package: github.com/openshift/hive
version: 296cb990171c6da62e134f3590c120bd16ef4d43
subpackages:
- contrib/pkg/aws_tag_deprovision
- package: gopkg.in/AlecAivazis/survey.v1
version: ^1.6.2
- package: github.com/openshift/hive
testImport:
- package: github.com/stretchr/testify
version: ^1.2.2
Expand Down
2 changes: 1 addition & 1 deletion pkg/destroy/destroyer.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"path/filepath"

atd "github.com/openshift/hive/contrib/pkg/aws_tag_deprovision"
atd "github.com/openshift/hive/contrib/pkg/awstagdeprovision"
log "github.com/sirupsen/logrus"

"github.com/openshift/installer/pkg/asset/metadata"
Expand Down

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

0 comments on commit b562fa3

Please sign in to comment.