fix regression in networkacl with conflicts with

This commit is contained in:
Clint Shryock 2015-05-15 14:38:06 -05:00
parent cc206cb411
commit af09f257c8
1 changed files with 5 additions and 6 deletions

View File

@ -31,12 +31,11 @@ func resourceAwsNetworkAcl() *schema.Resource {
Computed: false,
},
"subnet_id": &schema.Schema{
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Computed: false,
ConflictsWith: []string{"subnet_ids"},
Deprecated: "Attribute subnet_id is deprecated on network_acl resources. Use subnet_ids instead",
Type: schema.TypeString,
Optional: true,
ForceNew: true,
Computed: false,
Deprecated: "Attribute subnet_id is deprecated on network_acl resources. Use subnet_ids instead",
},
"subnet_ids": &schema.Schema{
Type: schema.TypeSet,