Merge remote-tracking branch 'origin/v4-networks' into feat/v4-subnets

# Conflicts: # go.mod # go.sum # nutanix/config.go # nutanix/provider/provider.go
nutanix · Sep 4, 2024 · 06ccf5e · 06ccf5e
2 parents 7855e31 + 14c9f4c
commit 06ccf5e
Show file tree

Hide file tree

Showing 3,469 changed files with 8 additions and 1,019,387 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,10 +19,9 @@ terraform-provider-nutanix
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 log.*
-!vendor/**
 
 #exclude vendor
-!vendor/**
+vendor/**
 
 # autogenerated fies
 *.autogenerated.*

diff --git a/nutanix/config.go b/nutanix/config.go
@@ -7,6 +7,13 @@ import (
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/networking"
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v4/prism"
 
+	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/client"
+	era "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/era"
+	foundation_central "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/fc"
+	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/foundation"
+	v3 "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/prism"
+	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/karbon"
+
 	"github.com/terraform-providers/terraform-provider-nutanix/nutanix/client"
 	era "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/era"
 	foundation_central "github.com/terraform-providers/terraform-provider-nutanix/nutanix/sdks/v3/fc"

diff --git a/vendor/cloud.google.com/go/LICENSE b/vendor/cloud.google.com/go/LICENSE