From 362fc02713014b3db64e1080998fb39e86373545 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 28 Apr 2015 12:35:06 +0200 Subject: [PATCH] godep: make sure to vendor iptb --- Godeps/Godeps.json | 8 ++++---- .../src/github.com/whyrusleeping/iptb/README.md | 8 ++++---- util/sadhack/godep.go | 3 +++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e0ca2c2ff..d400606b1 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -23,10 +23,6 @@ "ImportPath": "github.com/ActiveState/tail", "Rev": "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a" }, - { - "ImportPath":"github.com/whyrusleeping/iptb", - "Rev": "7f5790b9a136aca057bc8f1dc711e204c6343504" - }, { "ImportPath": "github.com/Sirupsen/logrus", "Comment": "v0.7.1", @@ -258,6 +254,10 @@ "ImportPath": "github.com/whyrusleeping/go-metrics", "Rev": "1cd8009604ec2238b5a71305a0ecd974066e0e16" }, + { + "ImportPath": "github.com/whyrusleeping/iptb", + "Rev": "7f5790b9a136aca057bc8f1dc711e204c6343504" + }, { "ImportPath": "golang.org/x/crypto/blowfish", "Rev": "b7d6bf2c61544745a02f83dec90393985fc3a065" diff --git a/Godeps/_workspace/src/github.com/whyrusleeping/iptb/README.md b/Godeps/_workspace/src/github.com/whyrusleeping/iptb/README.md index 1c3b9f284..415c26902 100644 --- a/Godeps/_workspace/src/github.com/whyrusleeping/iptb/README.md +++ b/Godeps/_workspace/src/github.com/whyrusleeping/iptb/README.md @@ -6,17 +6,17 @@ different bootstrapping patterns. iptb makes testing networks in ipfs easy! ### Commands: -- init +- init - creates and initializes 'n' repos - Options: - -n=[number of nodes] - -f : force overwriting of existing nodes - -bootstrap : select bootstrapping style for cluster choices: star, none -- start +- start - starts up all testbed nodes - Options: - -wait : wait until daemons are fully initialized -- stop +- stop - kills all testbed nodes - restart - kills and then restarts all testbed nodes @@ -28,7 +28,7 @@ easy! ### Configuration By default, iptb uses `$HOME/testbed` to store created nodes. This path is -configurable via the environment variables `IPTB_ROOT`. +configurable via the environment variables `IPTB_ROOT`. diff --git a/util/sadhack/godep.go b/util/sadhack/godep.go index 3d54f0444..e8f24c008 100644 --- a/util/sadhack/godep.go +++ b/util/sadhack/godep.go @@ -3,3 +3,6 @@ package util // FIXME: we need the go-random/random utility for our sharness test wich depends on go-humanize // Godep will drop it if we dont use it in ipfs. There should be a better way to do this. import _ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/dustin/go-humanize" + +// similar to the above, only used in the tests makefile +import _ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/whyrusleeping/iptb"