From af09f257c8d5522ce78f9a9088d04f653fb73ec9 Mon Sep 17 00:00:00 2001 From: Clint Shryock Date: Fri, 15 May 2015 14:38:06 -0500 Subject: [PATCH] fix regression in networkacl with conflicts with --- builtin/providers/aws/resource_aws_network_acl.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/builtin/providers/aws/resource_aws_network_acl.go b/builtin/providers/aws/resource_aws_network_acl.go index a54f013997..081a288b43 100644 --- a/builtin/providers/aws/resource_aws_network_acl.go +++ b/builtin/providers/aws/resource_aws_network_acl.go @@ -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,