Merge branch 'release-1.21.26' into develop

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

.changes/1.21.26.json

@@ -0,0 +1,22 @@
+[
+  {
+    "category": "``eks``",
+    "description": "Adds support for EKS add-ons \"preserve\" flag, which allows customers to maintain software on their EKS clusters after removing it from EKS add-ons management.",
+    "type": "api-change"
+  },
+  {
+    "category": "``comprehend``",
+    "description": "Add tagging support for Comprehend async inference job.",
+    "type": "api-change"
+  },
+  {
+    "category": "``robomaker``",
+    "description": "Documentation updates for RoboMaker",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "encryptionInTransitSupported added to DescribeInstanceTypes API",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.21.26
+=======
+
+* api-change:``eks``: Adds support for EKS add-ons "preserve" flag, which allows customers to maintain software on their EKS clusters after removing it from EKS add-ons management.
+* api-change:``comprehend``: Add tagging support for Comprehend async inference job.
+* api-change:``robomaker``: Documentation updates for RoboMaker
+* api-change:``ec2``: encryptionInTransitSupported added to DescribeInstanceTypes API
+
+
 1.21.25
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.21.25'
+__version__ = '1.21.26'
 
 
 class NullHandler(logging.Handler):

botocore/data/ec2/2016-11-15/paginators-1.json

@@ -613,6 +613,12 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "InstanceEventWindows"
+    },
+    "DescribeTrunkInterfaceAssociations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "InterfaceAssociations"
     }
   }
 }

botocore/data/eks/2017-11-01/service-2.json

@@ -666,7 +666,8 @@
         "InsufficientNumberOfReplicas",
         "ConfigurationConflict",
         "AdmissionRequestDenied",
-        "UnsupportedAddonModification"
+        "UnsupportedAddonModification",
+        "K8sResourceNotFound"
       ]
     },
     "AddonIssueList":{
@@ -1224,6 +1225,12 @@
           "documentation":"<p>The name of the add-on. The name must match one of the names returned by <a href=\"https://docs.aws.amazon.com/eks/latest/APIReference/API_ListAddons.html\"> <code>ListAddons</code> </a>.</p>",
           "location":"uri",
           "locationName":"addonName"
+        },
+        "preserve":{
+          "shape":"Boolean",
+          "documentation":"<p>Specifying this option preserves the add-on software on your cluster but Amazon EKS stops managing any settings for the add-on. If an IAM account is associated with the add-on, it is not removed.</p>",
+          "location":"querystring",
+          "locationName":"preserve"
         }
       }
     },
@@ -1607,7 +1614,8 @@
         "InsufficientNumberOfReplicas",
         "ConfigurationConflict",
         "AdmissionRequestDenied",
-        "UnsupportedAddonModification"
+        "UnsupportedAddonModification",
+        "K8sResourceNotFound"
       ]
     },
     "ErrorDetail":{

botocore/data/robomaker/2018-06-29/service-2.json

@@ -1572,7 +1572,7 @@
         },
         "failureBehavior":{
           "shape":"FailureBehavior",
-          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Restart the simulation job in the same host instance.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
+          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Leaves the instance running for its maximum timeout duration after a <code>4XX</code> error code.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
         },
         "robotApplications":{
           "shape":"RobotApplicationConfigs",
@@ -4109,7 +4109,7 @@
         },
         "failureBehavior":{
           "shape":"FailureBehavior",
-          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Restart the simulation job in the same host instance.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
+          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Leaves the host running for its maximum timeout duration after a <code>4XX</code> error code.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
         },
         "failureCode":{
           "shape":"SimulationJobErrorCode",
@@ -4282,7 +4282,7 @@
         },
         "failureBehavior":{
           "shape":"FailureBehavior",
-          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Restart the simulation job in the same host instance.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
+          "documentation":"<p>The failure behavior the simulation job.</p> <dl> <dt>Continue</dt> <dd> <p>Leaves the host running for its maximum timeout duration after a <code>4XX</code> error code.</p> </dd> <dt>Fail</dt> <dd> <p>Stop the simulation job and terminate the instance.</p> </dd> </dl>"
         },
         "useDefaultApplications":{
           "shape":"BoxedBoolean",

docs/source/conf.py

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