Merge branch 'release-2.30.0'2.30.0

1 files changed, 12 insertions, 1 deletions

diff --git a/boto/ec2/connection.py b/boto/ec2/connection.py
index 36db8aab..6cb108f9 100644
--- a/boto/ec2/connection.py
+++ b/boto/ec2/connection.py
@@ -798,6 +798,9 @@ class EC2Connection(AWSQueryConnection):
             * i2.2xlarge
             * i2.4xlarge
             * i2.8xlarge
+            * t2.micro
+            * t2.small
+            * t2.medium
 
         :type placement: string
         :param placement: The Availability Zone to launch the instance into.
@@ -1493,6 +1496,9 @@ class EC2Connection(AWSQueryConnection):
             * i2.2xlarge
             * i2.4xlarge
             * i2.8xlarge
+            * t2.micro
+            * t2.small
+            * t2.medium
 
         :type placement: string
         :param placement: The availability zone in which to launch
@@ -4213,11 +4219,14 @@ class EC2Connection(AWSQueryConnection):
 
     # Network Interface methods
 
-    def get_all_network_interfaces(self, filters=None, dry_run=False):
+    def get_all_network_interfaces(self, network_interface_ids=None, filters=None, dry_run=False):
         """
         Retrieve all of the Elastic Network Interfaces (ENI's)
         associated with your account.
 
+        :type network_interface_ids: list
+        :param network_interface_ids: a list of strings representing ENI IDs
+        
         :type filters: dict
         :param filters: Optional filters that can be used to limit
                         the results returned.  Filters are provided
@@ -4235,6 +4244,8 @@ class EC2Connection(AWSQueryConnection):
         :return: A list of :class:`boto.ec2.networkinterface.NetworkInterface`
         """
         params = {}
+        if network_interface_ids:
+            self.build_list_params(params, network_interface_ids, 'NetworkInterfaceId')
         if filters:
             self.build_filter_params(params, filters)
         if dry_run: