Merge pull request projectcalico#186 from artem-panchenko/update-libc…

…alico-go-imports Use new location of 'libcalico-go' repository
liubog2008 · Oct 12, 2016 · 9c90260 · 9c90260
2 parents 539193c + e180a66
commit 9c90260
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/calico.go b/calico.go
@@ -32,9 +32,9 @@ import (
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/projectcalico/calico-cni/k8s"
 	. "github.com/projectcalico/calico-cni/utils"
-	"github.com/tigera/libcalico-go/lib/api"
-	"github.com/tigera/libcalico-go/lib/errors"
-	cnet "github.com/tigera/libcalico-go/lib/net"
+	"github.com/projectcalico/libcalico-go/lib/api"
+	"github.com/projectcalico/libcalico-go/lib/errors"
+	cnet "github.com/projectcalico/libcalico-go/lib/net"
 )
 
 var hostname string

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -13,7 +13,7 @@ import:
 - package: github.com/onsi/gomega
   subpackages:
   - gexec
-- package: github.com/tigera/libcalico-go
+- package: github.com/projectcalico/libcalico-go
   subpackages:
   - lib/api
   - lib/client

diff --git a/ipam/calico-ipam.go b/ipam/calico-ipam.go
@@ -12,8 +12,8 @@ import (
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/projectcalico/calico-cni/utils"
-	"github.com/tigera/libcalico-go/lib/client"
-	cnet "github.com/tigera/libcalico-go/lib/net"
+	"github.com/projectcalico/libcalico-go/lib/client"
+	cnet "github.com/projectcalico/libcalico-go/lib/net"
 )
 
 func main() {

diff --git a/k8s/k8s.go b/k8s/k8s.go
@@ -11,16 +11,16 @@ import (
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/projectcalico/calico-cni/utils"
-	"github.com/tigera/libcalico-go/lib/api"
-	cnet "github.com/tigera/libcalico-go/lib/net"
+	"github.com/projectcalico/libcalico-go/lib/api"
+	cnet "github.com/projectcalico/libcalico-go/lib/net"
 
 	"encoding/json"
 
 	"k8s.io/client-go/1.4/kubernetes"
 	"k8s.io/client-go/1.4/tools/clientcmd"
 
 	log "github.com/Sirupsen/logrus"
-	"github.com/tigera/libcalico-go/lib/client"
+	"github.com/projectcalico/libcalico-go/lib/client"
 )
 
 // CmdAddK8s performs the "ADD" operation on a kubernetes pod

diff --git a/utils/utils.go b/utils/utils.go
@@ -16,9 +16,9 @@ import (
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/golang/glog"
-	"github.com/tigera/libcalico-go/lib/api"
-	"github.com/tigera/libcalico-go/lib/client"
-	cnet "github.com/tigera/libcalico-go/lib/net"
+	"github.com/projectcalico/libcalico-go/lib/api"
+	"github.com/projectcalico/libcalico-go/lib/client"
+	cnet "github.com/projectcalico/libcalico-go/lib/net"
 )
 
 func min(a, b int) int {