Merge branch 'release-1.42.71' into develop

* release-1.42.71:
  Bumping version to 1.42.71
  Update to latest models

Author: aws-sdk-python-automation

.changes/1.42.71.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "The DescribeInstanceTypes API now returns default connection tracking timeout values for TCP, UDP, and UDP stream via the new connectionTrackingConfiguration field on NetworkInfo.",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediaconvert``",
+    "description": "This update adds additional bitrate options for Dolby AC-4 audio outputs.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.42.71
+=======
+
+* api-change:``ec2``: The DescribeInstanceTypes API now returns default connection tracking timeout values for TCP, UDP, and UDP stream via the new connectionTrackingConfiguration field on NetworkInfo.
+* api-change:``mediaconvert``: This update adds additional bitrate options for Dolby AC-4 audio outputs.
+
+
 1.42.70
 =======
 

botocore/__init__.py

@@ -17,7 +17,7 @@
 import re
 from logging import NullHandler
 
-__version__ = '1.42.70'
+__version__ = '1.42.71'
 
 
 # Configure default logger to do nothing

botocore/data/ec2/2016-11-15/service-2.json

@@ -20828,6 +20828,27 @@
         "locationName":"item"
       }
     },
+    "DefaultConnectionTrackingConfiguration":{
+      "type":"structure",
+      "members":{
+        "DefaultTcpEstablishedTimeout":{
+          "shape":"DefaultTcpEstablishedTimeout",
+          "documentation":"<p>Default timeout (in seconds) for idle TCP connections in an established state.</p>",
+          "locationName":"defaultTcpEstablishedTimeout"
+        },
+        "DefaultUdpTimeout":{
+          "shape":"DefaultUdpTimeout",
+          "documentation":"<p>Default timeout (in seconds) for idle UDP flows that have seen traffic only in a single direction or a single request-response transaction.</p>",
+          "locationName":"defaultUdpTimeout"
+        },
+        "DefaultUdpStreamTimeout":{
+          "shape":"DefaultUdpStreamTimeout",
+          "documentation":"<p>Default timeout (in seconds) for idle UDP flows classified as streams which have seen more than one request-response transaction.</p>",
+          "locationName":"defaultUdpStreamTimeout"
+        }
+      },
+      "documentation":"<p>Indicates default conntrack information for the instance type. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/security-group-connection-tracking.html#connection-tracking-timeouts\"> Connection tracking timeouts </a> in the Amazon EC2 User Guide. </p>"
+    },
     "DefaultEnaQueueCountPerInterface":{"type":"integer"},
     "DefaultHttpTokensEnforcedState":{
       "type":"string",
@@ -20876,6 +20897,9 @@
         "capacity-block"
       ]
     },
+    "DefaultTcpEstablishedTimeout":{"type":"integer"},
+    "DefaultUdpStreamTimeout":{"type":"integer"},
+    "DefaultUdpTimeout":{"type":"integer"},
     "DefaultingDhcpOptionsId":{"type":"string"},
     "DeleteCapacityManagerDataExportRequest":{
       "type":"structure",
@@ -57292,6 +57316,11 @@
           "documentation":"<p>Indicates whether changing the number of ENA queues is supported.</p>",
           "locationName":"flexibleEnaQueuesSupport"
         },
+        "ConnectionTrackingConfiguration":{
+          "shape":"DefaultConnectionTrackingConfiguration",
+          "documentation":"<p>Indicates conntrack information for the instance type</p>",
+          "locationName":"connectionTrackingConfiguration"
+        },
         "SecondaryNetworkSupported":{
           "shape":"SecondaryNetworkSupportedFlag",
           "documentation":"<p>Indicates whether secondary interface attachments from secondary network are supported.</p>",

botocore/data/mediaconvert/2017-08-29/service-2.json

@@ -1850,9 +1850,9 @@
       "type": "structure",
       "members": {
         "Bitrate": {
-          "shape": "__integerMin192000Max1024000",
+          "shape": "__integerMin48000Max768000",
           "locationName": "bitrate",
-          "documentation": "Specify the average bitrate in bits per second. Leave blank to use the default bitrate for the coding mode you select according to ETSI TS 103 190. Valid bitrates for coding mode 2.0 (stereo): 192000, 256000, or 320000. Valid bitrates for coding mode 5.1 (3/2 with LFE): 512000. Valid bitrates for coding mode 5.1.4 (immersive): 512000, 768000, or 1024000."
+          "documentation": "Specify the average bitrate in bits per second. Leave blank to use the default bitrate for the coding mode you select according to ETSI TS 103 190. Valid bitrates for coding mode 2.0 (stereo): 48000, 64000, 96000, 128000, 144000, 192000, 256000, 288000, 320000, 384000, 448000, 512000, or 768000. Valid bitrates for coding mode 5.1 (3/2 with LFE): 96000, 128000, 144000, 192000, 256000, 288000, 320000, 384000, 448000, 512000, or 768000. Valid bitrates for coding mode 5.1.4 (immersive): 192000, 256000, 288000, 320000, 384000, 448000, 512000, or 768000."
         },
         "BitstreamMode": {
           "shape": "Ac4BitstreamMode",
@@ -4443,7 +4443,7 @@
         "Format": {
           "shape": "Format",
           "locationName": "format",
-          "documentation": "The format of your media file. For example: MP4, QuickTime (MOV), Matroska (MKV), WebM, MXF, Wave, or AVI. Note that this will be blank if your media file has a format that the MediaConvert Probe operation does not recognize."
+          "documentation": "The format of your media file. For example: MP4, QuickTime (MOV), Matroska (MKV), WebM, MXF, Wave, AVI, or MPEG-TS. Note that this will be blank if your media file has a format that the MediaConvert Probe operation does not recognize."
         },
         "Tracks": {
           "shape": "__listOfTrack",
@@ -6534,7 +6534,8 @@
         "webm",
         "mxf",
         "wave",
-        "avi"
+        "avi",
+        "mpegts"
       ]
     },
     "FrameCaptureSettings": {
@@ -15724,11 +15725,6 @@
       "min": 16,
       "max": 24
     },
-    "__integerMin192000Max1024000": {
-      "type": "integer",
-      "min": 192000,
-      "max": 1024000
-    },
     "__integerMin1Max1": {
       "type": "integer",
       "min": 1,
@@ -15919,6 +15915,11 @@
       "min": 48000,
       "max": 48000
     },
+    "__integerMin48000Max768000": {
+      "type": "integer",
+      "min": 48000,
+      "max": 768000
+    },
     "__integerMin4Max12": {
       "type": "integer",
       "min": 4,

docs/source/conf.py

@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '1.42.'
 # The full version, including alpha/beta/rc tags.
-release = '1.42.70'
+release = '1.42.71'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.