diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/cproxy.go 2014-12-02 13:44:51.378412184 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/udp/udp.go 2014-12-02 13:44:51.378412184 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/device.go 2014-12-02 13:44:51.378412184 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/backend/vxlan/vxlan.go 2014-12-02 13:44:51.379412195 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/main.go 2014-12-02 13:44:51.379412195 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iface.go 2014-12-02 13:44:51.380412206 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go.orig 2014-12-02 13:46:27.648471327 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/pkg/ip/iptables.go 2014-12-02 13:46:35.830561345 -0500
@@ -3,7 +3,7 @@ package ip
import (
"bytes"
"fmt"
- log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"
+ log "github.com/golang/glog"
"os/exec"
"regexp"
"strconv"
diff -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/registry.go 2014-12-02 13:44:51.380412206 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet.go 2014-12-02 13:44:51.381412217 -0500
@@ -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 -up flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go
--- flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go.orig 2014-11-27 13:43:14.000000000 -0500
+++ flannel-a7b435a9205335db25372bde8c1ff4e522ed3bc7/subnet/subnet_test.go 2014-12-02 13:44:51.381412217 -0500
@@ -6,7 +6,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"
)