Merge branch 'release-1.12.218' into develop

* release-1.12.218: Bumping version to 1.12.218 Update to latest models
boto · Aug 28, 2019 · ae55c98 · ae55c98
2 parents 1d99747 + e9ec1e1
commit ae55c98
Show file tree

Hide file tree

Showing 7 changed files with 151 additions and 16 deletions.
diff --git a/.changes/1.12.218.json b/.changes/1.12.218.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``sqs``", 
+    "description": "Update sqs client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``globalaccelerator``", 
+    "description": "Update globalaccelerator client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``mediaconvert``", 
+    "description": "Update mediaconvert client to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.12.218
+========
+
+* api-change:``sqs``: Update sqs client to latest version
+* api-change:``globalaccelerator``: Update globalaccelerator client to latest version
+* api-change:``mediaconvert``: Update mediaconvert client to latest version
+
+
 1.12.217
 ========
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.12.217'
+__version__ = '1.12.218'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/globalaccelerator/2018-08-08/service-2.json b/botocore/data/globalaccelerator/2018-08-08/service-2.json
diff --git a/botocore/data/mediaconvert/2017-08-29/service-2.json b/botocore/data/mediaconvert/2017-08-29/service-2.json
@@ -2429,6 +2429,11 @@
           "locationName": "settings",
           "documentation": "JobSettings contains all the transcode settings for a job."
         },
+        "SimulateReservedQueue": {
+          "shape": "SimulateReservedQueue",
+          "locationName": "simulateReservedQueue",
+          "documentation": "Enable this setting when you run a test job to estimate how many reserved transcoding slots (RTS) you need. When this is enabled, MediaConvert runs your job from an on-demand queue with similar performance to what you will see with one RTS in a reserved queue. This setting is disabled by default."
+        },
         "StatusUpdateInterval": {
           "shape": "StatusUpdateInterval",
           "locationName": "statusUpdateInterval",
@@ -5619,6 +5624,11 @@
           "locationName": "settings",
           "documentation": "JobSettings contains all the transcode settings for a job."
         },
+        "SimulateReservedQueue": {
+          "shape": "SimulateReservedQueue",
+          "locationName": "simulateReservedQueue",
+          "documentation": "Enable this setting when you run a test job to estimate how many reserved transcoding slots (RTS) you need. When this is enabled, MediaConvert runs your job from an on-demand queue with similar performance to what you will see with one RTS in a reserved queue. This setting is disabled by default."
+        },
         "Status": {
           "shape": "JobStatus",
           "locationName": "status",
@@ -8093,6 +8103,14 @@
       },
       "documentation": "Settings for SCC caption output."
     },
+    "SimulateReservedQueue": {
+      "type": "string",
+      "documentation": "Enable this setting when you run a test job to estimate how many reserved transcoding slots (RTS) you need. When this is enabled, MediaConvert runs your job from an on-demand queue with similar performance to what you will see with one RTS in a reserved queue. This setting is disabled by default.",
+      "enum": [
+        "DISABLED",
+        "ENABLED"
+      ]
+    },
     "SpekeKeyProvider": {
       "type": "structure",
       "members": {

diff --git a/botocore/data/sqs/2012-11-05/service-2.json b/botocore/data/sqs/2012-11-05/service-2.json
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.12.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.217'
+release = '1.12.218'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.