Skip to content

Commit

Permalink
refresh dependencies
Browse files Browse the repository at this point in the history
- refreshed go(deped) ones
  - Makefile tweaked to workaround godep "bug" we actually depend
    (vd github.com/tools/godep/issues/498)
- updated bundled hyperkit to latest upstream

Signed-off-by: António Meireles <[email protected]>
  • Loading branch information
AntonioMeireles committed Oct 19, 2016
1 parent ad81100 commit 425ef4c
Show file tree
Hide file tree
Showing 1,393 changed files with 19,197 additions and 220,885 deletions.
567 changes: 412 additions & 155 deletions Godeps/Godeps.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ BUILDDATE = $(shell /bin/date "+%FT%T%Z")

OPAMROOT ?= ~/.opam
HYPERKIT_GIT = "https://github.com/docker/hyperkit.git"
HYPERKIT_COMMIT = 7d2c6a72725c6c121ec03565af8732e695274d29
HYPERKIT_COMMIT = 2db2b2c60799918dafb3d95368e935c3f620911d

MKDIR = /bin/mkdir -p
CP = /bin/cp
Expand Down Expand Up @@ -98,6 +98,8 @@ Godeps: force
-e "s|import (|import ( \"github.com/shurcooL/httpfs/vfsutil\"|" \
components/common/assets/assets.go
$(GODEP) save ./...
# workaround for github.com/tools/godep/issues/498
$(GODEP) update ./...
# ... and then un-cheat
$(CP) components/common/assets/assets.go.bak \
components/common/assets/assets.go
Expand Down
49 changes: 0 additions & 49 deletions vendor/github.com/alecthomas/units/bytes_test.go

This file was deleted.

20 changes: 20 additions & 0 deletions vendor/github.com/beorn7/perks/LICENSE

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

63 changes: 0 additions & 63 deletions vendor/github.com/beorn7/perks/quantile/bench_test.go

This file was deleted.

121 changes: 0 additions & 121 deletions vendor/github.com/beorn7/perks/quantile/example_test.go

This file was deleted.

Loading

0 comments on commit 425ef4c

Please sign in to comment.