Skip to content

Commit c9c5c23

Browse files
authored
Merge pull request kubernetes#92824 from andyzhangx/fix-license-issue
fix: license issue in blob disk feature
2 parents 5a5cb56 + a552c76 commit c9c5c23

File tree

8 files changed

+22
-28
lines changed

8 files changed

+22
-28
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ replace (
379379
github.com/robfig/cron => github.com/robfig/cron v1.1.0
380380
github.com/rogpeppe/fastuuid => github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af
381381
github.com/rogpeppe/go-internal => github.com/rogpeppe/go-internal v1.3.0
382-
github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c
382+
github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
383383
github.com/russross/blackfriday => github.com/russross/blackfriday v1.5.2
384384
github.com/russross/blackfriday/v2 => github.com/russross/blackfriday/v2 v2.0.1
385385
github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=
401401
github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
402402
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
403403
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
404-
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c h1:ht7N4d/B7Ezf58nvMNVF3OlvDlz9pp+WHVcRNS0nink=
405-
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
404+
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 h1:if3/24+h9Sq6eDx8UUz1SO9cT9tizyIsATfB7b4D3tc=
405+
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
406406
github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
407407
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
408408
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=

staging/src/k8s.io/legacy-cloud-providers/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ require (
1919
github.com/google/go-cmp v0.4.0
2020
github.com/gophercloud/gophercloud v0.1.0
2121
github.com/mitchellh/mapstructure v1.1.2
22-
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c
22+
github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
2323
github.com/satori/go.uuid v1.2.0 // indirect
2424
github.com/stretchr/testify v1.4.0
2525
github.com/vmware/govmomi v0.20.3

staging/src/k8s.io/legacy-cloud-providers/go.sum

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/github.com/rubiojr/go-vhd/vhd/BUILD

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rubiojr/go-vhd/vhd/util.go

Lines changed: 0 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/rubiojr/go-vhd/vhd/vhd.go

Lines changed: 11 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
@@ -634,7 +634,7 @@ github.com/prometheus/procfs/internal/util
634634
github.com/quobyte/api
635635
# github.com/robfig/cron v1.1.0 => github.com/robfig/cron v1.1.0
636636
github.com/robfig/cron
637-
# github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c
637+
# github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 => github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021
638638
github.com/rubiojr/go-vhd/vhd
639639
# github.com/russross/blackfriday v1.5.2 => github.com/russross/blackfriday v1.5.2
640640
github.com/russross/blackfriday

0 commit comments

Comments
 (0)