Merge branch 'master' into batch

This commit is contained in:
Terry Cain 2017-10-19 21:16:40 +01:00
commit d67ef8d128
No known key found for this signature in database
GPG key ID: 14D90844E4E9B9F3
22 changed files with 961 additions and 88 deletions

View file

@ -38,7 +38,7 @@ from .sts import mock_sts, mock_sts_deprecated # flake8: noqa
from .ssm import mock_ssm # flake8: noqa
from .route53 import mock_route53, mock_route53_deprecated # flake8: noqa
from .swf import mock_swf, mock_swf_deprecated # flake8: noqa
from .xray import mock_xray # flake8: noqa
from .xray import mock_xray, mock_xray_client, XRaySegment # flake8: noqa
from .logs import mock_logs, mock_logs_deprecated # flake8: noqa
from .batch import mock_batch # flake8: noqa