Merge branch 'sanprabhu/cilium-node-subnet' of github.com:Azure/azure-container-networking into sanprabhu/cilium-node-subnet

santhoshmprabhu · santhoshmprabhu · commit 7879de5a10fe · 2024-10-22T14:30:16.000-07:00
diff --git a/cns/restserver/nodesubnet.go b/cns/restserver/nodesubnet.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Azure/azure-container-networking/cns/logger"
 	nodesubnet "github.com/Azure/azure-container-networking/cns/nodesubnet"
 	"github.com/Azure/azure-container-networking/cns/types"
-	errors "github.com/pkg/errors"
+	"github.com/pkg/errors"
 )
 
 var _ nodesubnet.IPConsumer = &HTTPRestService{}
diff --git a/cns/restserver/restserver.go b/cns/restserver/restserver.go
@@ -13,7 +13,7 @@ import (
 	"github.com/Azure/azure-container-networking/cns/dockerclient"
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/networkcontainers"
-	nodesubnet "github.com/Azure/azure-container-networking/cns/nodesubnet"
+	"github.com/Azure/azure-container-networking/cns/nodesubnet"
 	"github.com/Azure/azure-container-networking/cns/routes"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/cns/types/bounded"

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/Azure/azure-container-networking/cns/logger"`
`9`	`9`	`nodesubnet "github.com/Azure/azure-container-networking/cns/nodesubnet"`
`10`	`10`	`"github.com/Azure/azure-container-networking/cns/types"`
`11`		`- errors "github.com/pkg/errors"`
	`11`	`+ "github.com/pkg/errors"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`var _ nodesubnet.IPConsumer = &HTTPRestService{}`