fix versions

GoogleCloudPlatform · Nov 22, 2024 · 2552146 · 2552146
1 parent a6b0540
commit 2552146
Show file tree

Hide file tree

Showing 96 changed files with 0 additions and 384 deletions.
diff --git a/blueprints/gke/patterns/autopilot-cluster/versions.tf b/blueprints/gke/patterns/autopilot-cluster/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/gke/patterns/batch/versions.tf b/blueprints/gke/patterns/batch/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/gke/patterns/kafka/versions.tf b/blueprints/gke/patterns/kafka/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/gke/patterns/kong-cloudrun/versions.tf b/blueprints/gke/patterns/kong-cloudrun/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/gke/patterns/mysql/versions.tf b/blueprints/gke/patterns/mysql/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/gke/patterns/redis-cluster/versions.tf b/blueprints/gke/patterns/redis-cluster/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/blueprints/secops/secops-gke-forwarder/versions.tf b/blueprints/secops/secops-gke-forwarder/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/__experimental_deprecated/alloydb-instance/versions.tf b/modules/__experimental_deprecated/alloydb-instance/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/__experimental_deprecated/net-neg/versions.tf b/modules/__experimental_deprecated/net-neg/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/__experimental_deprecated/project-iam-magic/versions.tf b/modules/__experimental_deprecated/project-iam-magic/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/alloydb/versions.tf b/modules/alloydb/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/analytics-hub/versions.tf b/modules/analytics-hub/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/billing-account/versions.tf b/modules/billing-account/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/certificate-authority-service/versions.tf b/modules/certificate-authority-service/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/certificate-manager/versions.tf b/modules/certificate-manager/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/__need_fixing/squid/versions.tf b/modules/cloud-config-container/__need_fixing/squid/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/bindplane/versions.tf b/modules/cloud-config-container/bindplane/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf b/modules/cloud-config-container/envoy-sni-dyn-fwd-proxy/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"

diff --git a/modules/cloud-function-v1/versions.tf b/modules/cloud-function-v1/versions.tf
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-<<<<<<< HEAD
-# Fabric release: v35.1.0
-=======
 # Fabric release: v36.0.0
->>>>>>> fast-dev
 
 terraform {
   required_version = ">= 1.7.4"