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/moto/autoscaling/models.py
+++ b/moto/autoscaling/models.py
@ -341,6 +341,7 @@ class AutoScalingBackend(BaseBackend):

        max_size = make_int(max_size)
        min_size = make_int(min_size)
+        desired_capacity = make_int(desired_capacity)
        default_cooldown = make_int(default_cooldown)
        if health_check_period is None:
            health_check_period = 300