From 9079565e0d28cdb5e5bd01fd80725ee8c94272da Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 4 May 2016 16:06:05 +0200 Subject: [PATCH] *: appc/cni -> containernetworking/cni The project has been moved so internally we simply rename everything. Consumers are recommended to update their vendored version of cni. --- invoke/delegate.go | 2 +- invoke/exec.go | 2 +- invoke/find_test.go | 2 +- ip/link.go | 2 +- ipam/ipam.go | 6 +++--- ns/ns_test.go | 4 ++-- skel/skel.go | 2 +- testhelpers/testhelpers_test.go | 2 +- types/args_test.go | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/invoke/delegate.go b/invoke/delegate.go index 0a8198c3..ddf1d172 100644 --- a/invoke/delegate.go +++ b/invoke/delegate.go @@ -19,7 +19,7 @@ import ( "os" "strings" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) { diff --git a/invoke/exec.go b/invoke/exec.go index 337bfcb8..a85eede6 100644 --- a/invoke/exec.go +++ b/invoke/exec.go @@ -21,7 +21,7 @@ import ( "os" "os/exec" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) func pluginErr(err error, output []byte) error { diff --git a/invoke/find_test.go b/invoke/find_test.go index 4135538d..be4cc2dd 100644 --- a/invoke/find_test.go +++ b/invoke/find_test.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/appc/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/invoke" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/ip/link.go b/ip/link.go index 1ba529da..df168124 100644 --- a/ip/link.go +++ b/ip/link.go @@ -20,7 +20,7 @@ import ( "net" "os" - "github.com/appc/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/ns" "github.com/vishvananda/netlink" ) diff --git a/ipam/ipam.go b/ipam/ipam.go index f0adfb7f..d9fbff74 100644 --- a/ipam/ipam.go +++ b/ipam/ipam.go @@ -18,9 +18,9 @@ import ( "fmt" "os" - "github.com/appc/cni/pkg/invoke" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/types" "github.com/vishvananda/netlink" ) diff --git a/ns/ns_test.go b/ns/ns_test.go index 7ad882f5..a901eb35 100644 --- a/ns/ns_test.go +++ b/ns/ns_test.go @@ -22,8 +22,8 @@ import ( "os/exec" "path/filepath" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/testhelpers" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/testhelpers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/skel/skel.go b/skel/skel.go index 5c3532db..7347b078 100644 --- a/skel/skel.go +++ b/skel/skel.go @@ -22,7 +22,7 @@ import ( "log" "os" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) // CmdArgs captures all the arguments passed in to the plugin diff --git a/testhelpers/testhelpers_test.go b/testhelpers/testhelpers_test.go index ce328f01..62d45856 100644 --- a/testhelpers/testhelpers_test.go +++ b/testhelpers/testhelpers_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/unix" - "github.com/appc/cni/pkg/testhelpers" + "github.com/containernetworking/cni/pkg/testhelpers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/types/args_test.go b/types/args_test.go index 23aaf817..61fd2233 100644 --- a/types/args_test.go +++ b/types/args_test.go @@ -17,7 +17,7 @@ package types_test import ( "reflect" - . "github.com/appc/cni/pkg/types" + . "github.com/containernetworking/cni/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table"