BUILDS: Use vendor directory instead of Godeps

Keep the Godeps.json but store files in the vendor directly. This means
that there is no longer a need to rewrite import paths.

.travis.yml

@@ -1,10 +1,24 @@
 language: go
-go:
-  - 1.4
-  - 1.5
+
+matrix:
+  include:
+    - go: 1.5.4
+      env: GO15VENDOREXPERIMENT=1
+    - go: 1.6.2
+    - go: tip
+  allow_failures: 
+    - go: tip
+
+env:
+  global:
+    - TOOLS_CMD=golang.org/x/tools/cmd
+    - PATH=$GOROOT/bin:$PATH
 
 install:
- - go get golang.org/x/tools/cmd/cover 
+ - go get ${TOOLS_CMD}/cover
 
 script:
  - ./test
+
+notifications:
+  email: false

Godeps/Godeps.json

@@ -1,6 +1,7 @@
 {
 	"ImportPath": "github.com/coreos/flannel",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.6",
+	"GodepVersion": "v74",
 	"Packages": [
 		"./..."
 	],

Godeps/Readme

@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.

Godeps/_workspace/.gitignore

@@ -1,2 +0,0 @@
-/pkg
-/bin

backend/alloc/alloc.go

@@ -17,7 +17,7 @@ package alloc
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

backend/awsvpc/awsvpc.go

@@ -18,12 +18,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/service/ec2"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

backend/awsvpc/filter.go

@@ -14,7 +14,7 @@
 
 package awsvpc
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/service/ec2"
+import "github.com/aws/aws-sdk-go/service/ec2"
 
 type ecFilter []*ec2.Filter
 

backend/common.go

@@ -17,7 +17,7 @@ package backend
 import (
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

backend/gce/api.go

@@ -18,9 +18,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount"
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"code.google.com/p/goauth2/compute/serviceaccount"
+	"code.google.com/p/google-api-go-client/compute/v1"
+	log "github.com/golang/glog"
 )
 
 type gceAPI struct {

backend/gce/gce.go

@@ -42,9 +42,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"code.google.com/p/google-api-go-client/googleapi"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

backend/hostgw/hostgw.go

@@ -17,7 +17,7 @@ package hostgw
 import (
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

backend/hostgw/network.go

@@ -20,9 +20,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"

backend/manager.go

@@ -19,8 +19,8 @@ import (
 	"strings"
 	"sync"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

backend/udp/cproxy.go

@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"unsafe"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

backend/udp/network.go

@@ -21,9 +21,9 @@ import (
 	"sync"
 	"syscall"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

backend/udp/udp.go

@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

backend/vxlan/device.go

@@ -21,9 +21,9 @@ import (
 	"syscall"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink/nl"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink/nl"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

backend/vxlan/network.go

@@ -22,9 +22,9 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

backend/vxlan/vxlan.go

@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

main.go

@@ -23,9 +23,9 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/pkg/flagutil"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/pkg/flagutil"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/network"
 	"github.com/coreos/flannel/remote"

network/ipmasq.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-iptables/iptables"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/coreos/go-iptables/iptables"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

network/manager.go

@@ -26,9 +26,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"

network/network.go

@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"

pkg/ip/iface.go

@@ -19,7 +19,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink"
 )
 
 func getIfaceAddrs(iface *net.Interface) ([]netlink.Addr, error) {

remote/client.go

@@ -25,8 +25,8 @@ import (
 	"path"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

remote/http_logger.go

@@ -15,7 +15,7 @@
 package remote
 
 import (
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	log "github.com/golang/glog"
 	"net/http"
 )
 

remote/remote_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/subnet"

remote/server.go

@@ -24,12 +24,12 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/activation"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-systemd/daemon"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/gorilla/mux"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	"github.com/coreos/etcd/pkg/transport"
+	"github.com/coreos/go-systemd/activation"
+	"github.com/coreos/go-systemd/daemon"
+	log "github.com/golang/glog"
+	"github.com/gorilla/mux"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/subnet"
 )

subnet/clock.go

@@ -14,6 +14,6 @@
 
 package subnet
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/jonboulle/clockwork"
+import "github.com/jonboulle/clockwork"
 
 var clock clockwork.Clock = clockwork.NewRealClock()

subnet/local_manager.go

@@ -20,10 +20,10 @@ import (
 	"strconv"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
 	"github.com/coreos/flannel/pkg/ip"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 )
 
 const (

subnet/mock_etcd.go

@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 const DEFAULT_TTL time.Duration = 8760 * time.Hour // one year

subnet/mock_etcd_test.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"testing"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 )
 
 func expectSuccess(t *testing.T, r *etcd.Response, err error, expected *etcd.Response, expectedValue string) {

subnet/mock_registry.go

@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

subnet/registry.go

@@ -23,10 +23,10 @@ import (
 	"sync"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/pkg/transport"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"github.com/coreos/etcd/pkg/transport"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

subnet/registry_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

subnet/subnet.go

@@ -22,8 +22,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
 	"github.com/coreos/flannel/pkg/ip"
+	"golang.org/x/net/context"
 )
 
 var (

subnet/subnet_test.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	etcd "github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/etcd/client"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/jonboulle/clockwork"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	etcd "github.com/coreos/etcd/client"
+	"github.com/jonboulle/clockwork"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

subnet/watch.go

@@ -17,8 +17,8 @@ package subnet
 import (
 	"time"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/golang.org/x/net/context"
+	log "github.com/golang/glog"
+	"golang.org/x/net/context"
 
 	"github.com/coreos/flannel/pkg/ip"
 )

test

@@ -48,7 +48,7 @@ if [ -n "${fmtRes}" ]; then
 fi
 
 echo "Checking for license header..."
-licRes=$(for file in $(find . -type f -iname '*.go' ! -path './Godeps/*'); do
+licRes=$(for file in $(find . -type f -iname '*.go' ! -path './vendor/*'); do
 		head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e "  ${file}"
 	done;)
 if [ -n "${licRes}" ]; then

Godeps/_workspace/src/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go → vendor/code.google.com/p/goauth2/compute/serviceaccount/serviceaccount.go

@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 const (

Godeps/_workspace/src/code.google.com/p/goauth2/oauth/example/oauthreq.go → vendor/code.google.com/p/goauth2/oauth/example/oauthreq.go

@@ -13,7 +13,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 var (

Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/example/main.go → vendor/code.google.com/p/goauth2/oauth/jwt/example/main.go

@@ -16,7 +16,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt"
+	"code.google.com/p/goauth2/oauth/jwt"
 )
 
 const scope = "https://www.googleapis.com/auth/devstorage.read_only"

Godeps/_workspace/src/code.google.com/p/goauth2/oauth/jwt/jwt.go → vendor/code.google.com/p/goauth2/oauth/jwt/jwt.go

@@ -50,7 +50,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/goauth2/oauth"
+	"code.google.com/p/goauth2/oauth"
 )
 
 // These are the default/standard values for this to work for Google service accounts.

Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go → vendor/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go

@@ -14,7 +14,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi"
+	"code.google.com/p/google-api-go-client/googleapi"
 	"io"
 	"net/http"
 	"net/url"

Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go → vendor/code.google.com/p/google-api-go-client/googleapi/googleapi.go

@@ -19,7 +19,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
+	"code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
 )
 
 // ContentTyper is an interface for Readers which know (or would like

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go → vendor/github.com/aws/aws-sdk-go/aws/awsutil/copy_test.go

@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go → vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value_test.go

@@ -3,7 +3,7 @@ package awsutil_test
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config.go → vendor/github.com/aws/aws-sdk-go/aws/config.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 // The default number of retries for a service. The value of -1 indicates that

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/config_test.go → vendor/github.com/aws/aws-sdk-go/aws/config_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 var testCredentials = credentials.NewStaticCredentials("AKID", "SECRET", "SESSION")

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go → vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers.go

@@ -10,9 +10,9 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // Interface for matching types which also have a Len method.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go → vendor/github.com/aws/aws-sdk-go/aws/corehandlers/handlers_test.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/corehandlers"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
 )
 
 func TestValidateEndpointHandler(t *testing.T) {

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go → vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator.go

@@ -5,8 +5,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // ValidateParameters is a request handler to validate the input parameters.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go → vendor/github.com/aws/aws-sdk-go/aws/corehandlers/param_validator_test.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/corehandlers"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/corehandlers"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 var testSvc = func() *service.Service {

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider.go

@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/chain_provider_test.go

@@ -3,7 +3,7 @@ package credentials
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/credentials_test.go

@@ -3,7 +3,7 @@ package credentials
 import (
 	"testing"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 )
 
 // A EC2RoleProvider retrieves credentials from the EC2 service, and keeps track if

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds/ec2_role_provider_test.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 )
 
 const credsRespTmpl = `{

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/env_provider.go

@@ -3,7 +3,7 @@ package credentials
 import (
 	"os"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/shared_credentials_provider.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vaughan0/go-ini"
+	"github.com/vaughan0/go-ini"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/static_provider.go

@@ -1,7 +1,7 @@
 package credentials
 
 import (
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 var (

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 // AssumeRoler represents the minimal subset of the STS client API used by this provider.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go → vendor/github.com/aws/aws-sdk-go/aws/credentials/stscreds/assume_role_provider_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/sts"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/defaults/defaults.go → vendor/github.com/aws/aws-sdk-go/aws/defaults/defaults.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
 )
 
 // DefaultChainCredentials is a Credentials which will find the first available

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go → vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api.go

@@ -3,7 +3,7 @@ package ec2metadata
 import (
 	"path"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 // GetMetadata uses the path provided to request

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go → vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/api_test.go

@@ -10,10 +10,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/ec2metadata"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 func initTestServer(path string, resp string) *httptest.Server {

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go → vendor/github.com/aws/aws-sdk-go/aws/ec2metadata/service.go

@@ -4,12 +4,12 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 // DefaultRetries states the default number of times the service client will

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/errors.go → vendor/github.com/aws/aws-sdk-go/aws/errors.go

@@ -1,6 +1,6 @@
 package aws
 
-import "github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+import "github.com/aws/aws-sdk-go/aws/awserr"
 
 var (
 	// ErrMissingRegion is an error that is returned if region configuration is

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/handlers_test.go → vendor/github.com/aws/aws-sdk-go/aws/request/handlers_test.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 func TestHandlerList(t *testing.T) {

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request.go → vendor/github.com/aws/aws-sdk-go/aws/request/request.go

@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awsutil"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service/serviceinfo"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awsutil"
+	"github.com/aws/aws-sdk-go/aws/service/serviceinfo"
 )
 
 // A Request is the service request to be made.

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go → vendor/github.com/aws/aws-sdk-go/aws/request/request_pagination_test.go

@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/internal/test/unit"
 	"github.com/aws/aws-sdk-go/service/dynamodb"
 	"github.com/aws/aws-sdk-go/service/s3"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
 )
 
 var _ = unit.Imported

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/request_test.go → vendor/github.com/aws/aws-sdk-go/aws/request/request_test.go

@@ -10,11 +10,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/credentials"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/service"
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/service"
 	"github.com/stretchr/testify/assert"
 )
 

Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/request/retryer.go → vendor/github.com/aws/aws-sdk-go/aws/request/retryer.go

@@ -3,7 +3,7 @@ package request
 import (
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
+	"github.com/aws/aws-sdk-go/aws/awserr"
 )
 
 // Retryer is an interface to control retry logic for a given service.