Merge remote-tracking branch 'spulec/moto/master' into organizations_support

This commit is contained in:
Ashley Gould 2018-09-28 08:52:22 -07:00
commit 95700d6631
71 changed files with 2645 additions and 267 deletions

View file

@ -177,7 +177,7 @@ def test_add_servers():
```
#### Using moto 1.0.X with boto2
moto 1.0.X mock docorators are defined for boto3 and do not work with boto2. Use the @mock_AWSSVC_deprecated to work with boto2.
moto 1.0.X mock decorators are defined for boto3 and do not work with boto2. Use the @mock_AWSSVC_deprecated to work with boto2.
Using moto with boto2
```python