From 705addbd9fc344d30a47979514ee36ed72db3a4e Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 20 Sep 2016 02:58:05 +0200
Subject: [PATCH 1/3] deps: point multiaddr imports to multiformats org

---
 shell.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell.go b/shell.go
index 5b9a92ac2..acc62a569 100644
--- a/shell.go
+++ b/shell.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	ma "github.com/jbenet/go-multiaddr"
-	manet "github.com/jbenet/go-multiaddr-net"
+	ma "github.com/multiformats/go-multiaddr"
+	manet "github.com/multiformats/go-multiaddr-net"
 	files "github.com/whyrusleeping/go-multipart-files"
 	tar "github.com/whyrusleeping/tar-utils"
 )

From 0ac4a0c9998a4631d38fb87ca89299a724695a13 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 20 Sep 2016 03:18:11 +0200
Subject: [PATCH 2/3] Update travis CI config

---
 .travis.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a687a13b..c9a0c0dff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,7 @@ sudo: required
 language: go
 
 go:
-  - 1.4
-  - 1.5
+  - 1.7
   - tip
 
 matrix:
@@ -15,9 +14,9 @@ services:
   - docker
 
 before_install:
-- docker pull jbenet/go-ipfs:latest
+- docker pull ipfs/go-ipfs:latest
 - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs
-- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 jbenet/go-ipfs
+- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs
 
 install:
   - go get -t -v ./...

From 0248c46cd703621c1e91db5ad35f232e65b02592 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Tue, 20 Sep 2016 03:35:14 +0200
Subject: [PATCH 3/3] Test against go-ipfs master

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c9a0c0dff..6528f584e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,9 +14,9 @@ services:
   - docker
 
 before_install:
-- docker pull ipfs/go-ipfs:latest
+- docker pull ipfs/go-ipfs:master
 - mkdir /tmp/ipfs && chmod 0777 /tmp/ipfs
-- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs
+- docker run -d -v /tmp/ipfs:/data/ipfs -p 8080:8080 -p 4001:4001 -p 5001:5001 ipfs/go-ipfs:master
 
 install:
   - go get -t -v ./...