summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavanum Srinivas <davanum@gmail.com>2017-03-23 16:57:14 -0400
committerDavanum Srinivas <davanum@gmail.com>2017-03-23 16:59:08 -0400
commitf2bf1a7d8d0b73c3167e9c37a30f72800c82afdf (patch)
treeb96dfedf19f45d28b327c4207875d9f6ff26b9b0
parent38fe101d639fd7527dfa05d081790d288fa11178 (diff)
Get depend-update to work reliablyHEADmaster
Earlier "make depend-update" would fail as it tried to pull stuff down that's already in our repo. So let's just ignore the stuff we know we already have. Change-Id: I11d22446e9be20686b2050a06aafab932541c0de
Notes
Notes (review): Code-Review+2: Davanum Srinivas (dims) <davanum@gmail.com> Workflow+1: Davanum Srinivas (dims) <davanum@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 23 Mar 2017 21:27:42 +0000 Reviewed-on: https://review.openstack.org/449322 Project: openstack/docker-machine-openstack Branch: refs/heads/master
-rw-r--r--glide.lock7
-rw-r--r--glide.yaml2
2 files changed, 7 insertions, 2 deletions
diff --git a/glide.lock b/glide.lock
index 54d509d..28bbe8d 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
1hash: f0fdc617a0337ac35ef7e13ce83e231286bb4636974151ac8a57680af8d064f7 1hash: 23ea93249b9a00310b9f06978542a6fd5c8f92df18d5cf5239496cac4de2ad95
2updated: 2017-03-23T15:12:37.058586603-04:00 2updated: 2017-03-23T16:56:29.980808847-04:00
3imports: 3imports:
4- name: github.com/docker/docker 4- name: github.com/docker/docker
5 version: a8a31eff10544860d2188dddabdee4d727545796 5 version: a8a31eff10544860d2188dddabdee4d727545796
@@ -9,6 +9,9 @@ imports:
9 version: 0f08d3c510bc8c2a2c087cabd6614d8776ca8687 9 version: 0f08d3c510bc8c2a2c087cabd6614d8776ca8687
10 subpackages: 10 subpackages:
11 - libmachine/drivers 11 - libmachine/drivers
12 - libmachine/drivers/plugin
13 - libmachine/drivers/plugin/localbinary
14 - libmachine/drivers/rpc
12 - libmachine/log 15 - libmachine/log
13 - libmachine/mcnflag 16 - libmachine/mcnflag
14 - libmachine/mcnutils 17 - libmachine/mcnutils
diff --git a/glide.yaml b/glide.yaml
index 9f58a8a..9fdd24b 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -27,3 +27,5 @@ testImport:
27- package: github.com/stretchr/testify 27- package: github.com/stretchr/testify
28 subpackages: 28 subpackages:
29 - assert 29 - assert
30ignore:
31 - git.openstack.org/openstack/docker-machine-openstack/driver \ No newline at end of file