Merge branch 'master' into add_instance_type_offerings

This commit is contained in:
Bert Blommers 2020-12-02 10:57:07 +00:00
commit 5d208bfd04
47 changed files with 1202 additions and 74 deletions

View file

@ -2,6 +2,9 @@ from moto import mock_cloudformation_deprecated, mock_ec2_deprecated
from moto import mock_cloudformation, mock_ec2
from tests.test_cloudformation.fixtures import vpc_eni
import boto
import boto.ec2
import boto.cloudformation
import boto.vpc
import boto3
import json
import sure # noqa