Merge pull request #2012 from toastdriven/add-m3-instances

Added the M3 instance types.
boto · Jan 22, 2014 · 7c82f57 · 7c82f57
2 parents 2b72f32 + 0158c54
commit 7c82f57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/boto/ec2/connection.py b/boto/ec2/connection.py
@@ -750,6 +750,8 @@ def run_instances(self, image_id, min_count=1, max_count=1,
             * m1.medium
             * m1.large
             * m1.xlarge
+            * m3.medium
+            * m3.large
             * m3.xlarge
             * m3.2xlarge
             * c1.medium
@@ -1443,6 +1445,8 @@ def request_spot_instances(self, price, image_id, count=1, type='one-time',
             * m1.medium
             * m1.large
             * m1.xlarge
+            * m3.medium
+            * m3.large
             * m3.xlarge
             * m3.2xlarge
             * c1.medium

diff --git a/boto/ec2/image.py b/boto/ec2/image.py
@@ -208,6 +208,8 @@ def run(self, min_count=1, max_count=1, key_name=None,
             * m1.medium
             * m1.large
             * m1.xlarge
+            * m3.medium
+            * m3.large
             * m3.xlarge
             * m3.2xlarge
             * c1.medium