From e9097f81f65a1596ab79989de0e0ae8d0d031012 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Wed, 19 Nov 2014 14:18:08 +0100
Subject: [PATCH] remove third party dependency on Godeps

---
 backend/udp/cproxy.go   | 2 +-
 backend/udp/udp.go      | 4 ++--
 backend/vxlan/device.go | 6 +++---
 backend/vxlan/vxlan.go  | 4 ++--
 main.go                 | 4 ++--
 pkg/ip/iface.go         | 2 +-
 subnet/registry.go      | 4 ++--
 subnet/subnet.go        | 4 ++--
 subnet/subnet_test.go   | 2 +-
 9 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/backend/udp/cproxy.go b/backend/udp/cproxy.go
index 062d277..f1cce26 100644
--- a/backend/udp/cproxy.go
+++ b/backend/udp/cproxy.go
@@ -9,7 +9,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"
 )
diff --git a/backend/udp/udp.go b/backend/udp/udp.go
index 90f8617..782f7d3 100644
--- a/backend/udp/udp.go
+++ b/backend/udp/udp.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/vishvananda/netlink"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/backend/vxlan/device.go b/backend/vxlan/device.go
index a15b067..9764189 100644
--- a/backend/vxlan/device.go
+++ b/backend/vxlan/device.go
@@ -7,9 +7,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"
 )
diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
index b47eea2..4a878ce 100644
--- a/backend/vxlan/vxlan.go
+++ b/backend/vxlan/vxlan.go
@@ -6,8 +6,8 @@ import (
 	"net"
 	"sync"
 
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
+	log "github.com/golang/glog"
+	"github.com/vishvananda/netlink"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/subnet"
diff --git a/main.go b/main.go
index 5f81923..0955fc7 100644
--- a/main.go
+++ b/main.go
@@ -12,8 +12,8 @@ import (
 	"syscall"
 	"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/go-systemd/daemon"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/backend"
 	"github.com/coreos/flannel/pkg/ip"
diff --git a/pkg/ip/iface.go b/pkg/ip/iface.go
index 077feec..dee69a6 100644
--- a/pkg/ip/iface.go
+++ b/pkg/ip/iface.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"syscall"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink"
 )
 
 func GetIfaceIP4Addr(iface *net.Interface) (net.IP, error) {
diff --git a/subnet/registry.go b/subnet/registry.go
index 8c6797e..ccfee74 100644
--- a/subnet/registry.go
+++ b/subnet/registry.go
@@ -5,8 +5,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/coreos/go-etcd/etcd"
+	log "github.com/golang/glog"
 )
 
 type subnetRegistry interface {
diff --git a/subnet/subnet.go b/subnet/subnet.go
index 465952f..1208dfd 100644
--- a/subnet/subnet.go
+++ b/subnet/subnet.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
-	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+	"github.com/coreos/go-etcd/etcd"
+	log "github.com/golang/glog"
 
 	"github.com/coreos/flannel/pkg/ip"
 	"github.com/coreos/flannel/pkg/task"
diff --git a/subnet/subnet_test.go b/subnet/subnet_test.go
index 803fdc7..2ee58d5 100644
--- a/subnet/subnet_test.go
+++ b/subnet/subnet_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
+	"github.com/coreos/go-etcd/etcd"
 
 	"github.com/coreos/flannel/pkg/ip"
 )
-- 
1.9.3