Skip to content

Commit

Permalink
Merge branch 'master' into ap/gcfs
Browse files Browse the repository at this point in the history
  • Loading branch information
apeabody authored Sep 12, 2024
2 parents 1c90f9a + 0ce1df6 commit e42a922
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions modules/asm/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ terraform {
google = {
source = "hashicorp/google"
# Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 6"
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
}
google-beta = {
source = "hashicorp/google-beta"
# Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 6"
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/auth/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ terraform {
google = {
source = "hashicorp/google"
# Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 6"
version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 7"
}
}

Expand Down

0 comments on commit e42a922

Please sign in to comment.