Merge in master.

2017-03-05 09:58:39 -05:00 · 2017-03-05 09:58:39 -05:00 · 3b4ef2cf15
commit 3b4ef2cf15
parent d530bcf4a7 0393c384ad
26 changed files with 565 additions and 65 deletions
--- a/tests/test_cloudformation/fixtures/vpc_single_instance_in_subnet.py
+++ b/tests/test_cloudformation/fixtures/vpc_single_instance_in_subnet.py
@ -236,6 +236,10 @@ template = {
                            "Ref": "AWS::StackId"
                        },
                        "Key": "Application"
+                    },
+                    {
+                        "Value": "Bar",
+                        "Key": "Foo"
                    }
                ],
                "SecurityGroupIds": [