Fix merge conflicts for cloudwatch.

This commit is contained in:
Steve Pulec 2014-10-30 23:51:09 -04:00
commit 93f56322d8
7 changed files with 264 additions and 0 deletions

View file

@ -1,5 +1,6 @@
from __future__ import unicode_literals
from moto.autoscaling import autoscaling_backend
from moto.cloudwatch import cloudwatch_backend
from moto.dynamodb import dynamodb_backend
from moto.dynamodb2 import dynamodb_backend2
from moto.ec2 import ec2_backend
@ -14,6 +15,7 @@ from moto.route53 import route53_backend
BACKENDS = {
'autoscaling': autoscaling_backend,
'cloudwatch': cloudwatch_backend,
'dynamodb': dynamodb_backend,
'dynamodb2': dynamodb_backend2,
'ec2': ec2_backend,