Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #317

Merged
merged 2 commits into from
May 20, 2020
Merged

Update dependencies #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14e4903
Update dependencies
annakhm May 19, 2020
2968062
Remove ConflictsWith spec in nested structure
annakhm May 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ module github.com/terraform-providers/terraform-provider-nsxt
require (
github.com/google/uuid v1.1.1
github.com/hashicorp/go-version v1.2.0
github.com/hashicorp/terraform-plugin-sdk v1.1.0
github.com/hashicorp/terraform-plugin-sdk v1.12.0
github.com/vmware/go-vmware-nsxt v0.0.0-20191219213550-f4221331f638
github.com/vmware/vsphere-automation-sdk-go/lib v0.2.0
github.com/vmware/vsphere-automation-sdk-go/runtime v0.2.0
github.com/vmware/vsphere-automation-sdk-go/services/nsxt v0.3.0
github.com/vmware/vsphere-automation-sdk-go/services/nsxt-gm v0.1.0
)
43 changes: 43 additions & 0 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions nsxt/segment_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,12 @@ func getPolicySegmentSubnetSchema() *schema.Resource {
Optional: true,
Elem: getPolicySegmentDhcpV4ConfigSchema(),
MaxItems: 1,
ConflictsWith: []string{"subnet.dhcp_v6_config"},
},
"dhcp_v6_config": {
Type: schema.TypeList,
Optional: true,
Elem: getPolicySegmentDhcpV6ConfigSchema(),
MaxItems: 1,
ConflictsWith: []string{"subnet.dhcp_v4_config"},
},
"dhcp_ranges": {
Type: schema.TypeList,
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/awserr/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions vendor/github.com/aws/aws-sdk-go/aws/awsutil/path_value.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/github.com/aws/aws-sdk-go/aws/client/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

151 changes: 106 additions & 45 deletions vendor/github.com/aws/aws-sdk-go/aws/client/default_retryer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions vendor/github.com/aws/aws-sdk-go/aws/client/logger.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions vendor/github.com/aws/aws-sdk-go/aws/client/no_op_retryer.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/aws/aws-sdk-go/aws/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading