Merge branch 'master' into route_diff_fix

2015-01-02 19:08:53 +11:00 · 2015-01-02 19:08:53 +11:00 · f6385215f6
parent 19c6d04928 9bdb2fb2d1
commit f6385215f6
1 changed files with 0 additions and 4 deletions
--- a/builtin/providers/aws/resource_aws_route_table.go
+++ b/builtin/providers/aws/resource_aws_route_table.go
@ -116,10 +116,6 @@ func resourceAwsRouteTableRead(d *schema.ResourceData, meta interface{}) error {
 			continue
 		}

-		if r.Origin == "EnableVgwRoutePropagation" {
-			continue
-		}
-
 		m := make(map[string]interface{})
 		m["cidr_block"] = r.DestinationCidrBlock