Merge branch 'release-1.10.81'

* release-1.10.81:
  Bumping version to 1.10.81
  Update to latest models
  Update doc site links

.changes/1.10.81.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``mediaconvert``", 
+    "description": "Update mediaconvert client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``dynamodb``", 
+    "description": "Update dynamodb client to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.10.81
+=======
+
+* api-change:``mediaconvert``: Update mediaconvert client to latest version
+* api-change:``dynamodb``: Update dynamodb client to latest version
+
+
 1.10.80
 =======
 

README.rst

@@ -16,7 +16,7 @@ botocore package is the foundation for the
 
 Documentation
 -------------
-Documentation for ``botocore`` can be found on `Read the Docs <https://botocore.readthedocs.io/en/latest/>`__.
+Documentation for ``botocore`` can be found on `Read the Docs <https://botocore.amazonaws.com/v1/documentation/api/latest/index.html>`__.
 
 
 Getting Help

botocore/__init__.py

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

botocore/data/dynamodb/2012-08-10/service-2.json

@@ -831,15 +831,15 @@
         },
         "BackupType":{
           "shape":"BackupType",
-          "documentation":"<p>BackupType:</p> <ul> <li> <p> <code>USER</code> - On demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On demand backup automatically created by DynamoDB.</p> </li> </ul>"
+          "documentation":"<p>BackupType:</p> <ul> <li> <p> <code>USER</code> - On-demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On-demand backup automatically created by DynamoDB.</p> </li> </ul>"
         },
         "BackupCreationDateTime":{
           "shape":"BackupCreationDateTime",
           "documentation":"<p>Time at which the backup was created. This is the request time of the backup. </p>"
         },
         "BackupExpiryDateTime":{
           "shape":"Date",
-          "documentation":"<p>Time at which the automatic on demand backup created by DynamoDB will expire. This <code>SYSTEM</code> on demand backup expires automatically 35 days after its creation.</p>"
+          "documentation":"<p>Time at which the automatic on-demand backup created by DynamoDB will expire. This <code>SYSTEM</code> on-demand backup expires automatically 35 days after its creation.</p>"
         }
       },
       "documentation":"<p>Contains the details of the backup created for the table.</p>"
@@ -911,15 +911,15 @@
         },
         "BackupExpiryDateTime":{
           "shape":"Date",
-          "documentation":"<p>Time at which the automatic on demand backup created by DynamoDB will expire. This <code>SYSTEM</code> on demand backup expires automatically 35 days after its creation.</p>"
+          "documentation":"<p>Time at which the automatic on-demand backup created by DynamoDB will expire. This <code>SYSTEM</code> on-demand backup expires automatically 35 days after its creation.</p>"
         },
         "BackupStatus":{
           "shape":"BackupStatus",
           "documentation":"<p>Backup can be in one of the following states: CREATING, ACTIVE, DELETED.</p>"
         },
         "BackupType":{
           "shape":"BackupType",
-          "documentation":"<p>BackupType:</p> <ul> <li> <p> <code>USER</code> - On demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On demand backup automatically created by DynamoDB.</p> </li> </ul>"
+          "documentation":"<p>BackupType:</p> <ul> <li> <p> <code>USER</code> - On-demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On-demand backup automatically created by DynamoDB.</p> </li> </ul>"
         },
         "BackupSizeBytes":{
           "shape":"BackupSizeBytes",
@@ -1138,7 +1138,7 @@
       "members":{
         "ContinuousBackupsStatus":{
           "shape":"ContinuousBackupsStatus",
-          "documentation":"<p> <code>ContinuousBackupsStatus</code> can be one of the following states : ENABLED, DISABLED</p>"
+          "documentation":"<p> <code>ContinuousBackupsStatus</code> can be one of the following states: ENABLED, DISABLED</p>"
         },
         "PointInTimeRecoveryDescription":{
           "shape":"PointInTimeRecoveryDescription",
@@ -2008,6 +2008,7 @@
       "member":{"shape":"AttributeMap"}
     },
     "KMSMasterKeyArn":{"type":"string"},
+    "KMSMasterKeyId":{"type":"string"},
     "Key":{
       "type":"map",
       "key":{"shape":"AttributeName"},
@@ -2108,7 +2109,7 @@
       "members":{
         "TableName":{
           "shape":"TableName",
-          "documentation":"<p>The backups from the table specified by TableName are listed. </p>"
+          "documentation":"<p>The backups from the table specified by <code>TableName</code> are listed. </p>"
         },
         "Limit":{
           "shape":"BackupsInputLimit",
@@ -2128,7 +2129,7 @@
         },
         "BackupType":{
           "shape":"BackupTypeFilter",
-          "documentation":"<p>The backups from the table specified by BackupType are listed.</p> <p>Where BackupType can be:</p> <ul> <li> <p> <code>USER</code> - On demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On demand backup automatically created by DynamoDB.</p> </li> <li> <p> <code>ALL</code> - All types of on demand backups (USER and SYSTEM).</p> </li> </ul>"
+          "documentation":"<p>The backups from the table specified by <code>BackupType</code> are listed.</p> <p>Where <code>BackupType</code> can be:</p> <ul> <li> <p> <code>USER</code> - On-demand backup created by you.</p> </li> <li> <p> <code>SYSTEM</code> - On-demand backup automatically created by DynamoDB.</p> </li> <li> <p> <code>ALL</code> - All types of on-demand backups (USER and SYSTEM).</p> </li> </ul>"
         }
       }
     },
@@ -2996,7 +2997,7 @@
       "members":{
         "Status":{
           "shape":"SSEStatus",
-          "documentation":"<p>The current state of server-side encryption:</p> <ul> <li> <p> <code>ENABLING</code> - Server-side encryption is being enabled.</p> </li> <li> <p> <code>ENABLED</code> - Server-side encryption is enabled.</p> </li> <li> <p> <code>DISABLING</code> - Server-side encryption is being disabled.</p> </li> <li> <p> <code>DISABLED</code> - Server-side encryption is disabled.</p> </li> </ul>"
+          "documentation":"<p>The current state of server-side encryption:</p> <ul> <li> <p> <code>ENABLING</code> - Server-side encryption is being enabled.</p> </li> <li> <p> <code>ENABLED</code> - Server-side encryption is enabled.</p> </li> <li> <p> <code>DISABLING</code> - Server-side encryption is being disabled.</p> </li> <li> <p> <code>DISABLED</code> - Server-side encryption is disabled.</p> </li> <li> <p> <code>UPDATING</code> - Server-side encryption is being updated.</p> </li> </ul>"
         },
         "SSEType":{
           "shape":"SSEType",
@@ -3012,11 +3013,18 @@
     "SSEEnabled":{"type":"boolean"},
     "SSESpecification":{
       "type":"structure",
-      "required":["Enabled"],
       "members":{
         "Enabled":{
           "shape":"SSEEnabled",
           "documentation":"<p>Indicates whether server-side encryption is enabled (true) or disabled (false) on the table.</p>"
+        },
+        "SSEType":{
+          "shape":"SSEType",
+          "documentation":"<p>Server-side encryption type:</p> <ul> <li> <p> <code>AES256</code> - Server-side encryption which uses the AES256 algorithm.</p> </li> <li> <p> <code>KMS</code> - Server-side encryption which uses AWS Key Management Service. (default)</p> </li> </ul>"
+        },
+        "KMSMasterKeyId":{
+          "shape":"KMSMasterKeyId",
+          "documentation":"<p>The KMS Master Key (CMK) which should be used for the KMS encryption. To specify a CMK, use its key ID, Amazon Resource Name (ARN), alias name, or alias ARN. Note that you should only provide this parameter if the key is different from the default DynamoDB KMS Master Key alias/aws/dynamodb.</p>"
         }
       },
       "documentation":"<p>Represents the settings used to enable server-side encryption.</p>"
@@ -3027,7 +3035,8 @@
         "ENABLING",
         "ENABLED",
         "DISABLING",
-        "DISABLED"
+        "DISABLED",
+        "UPDATING"
       ]
     },
     "SSEType":{
@@ -3717,6 +3726,10 @@
         "StreamSpecification":{
           "shape":"StreamSpecification",
           "documentation":"<p>Represents the DynamoDB Streams configuration for the table.</p> <note> <p>You will receive a <code>ResourceInUseException</code> if you attempt to enable a stream on a table that already has a stream, or if you attempt to disable a stream on a table which does not have a stream.</p> </note>"
+        },
+        "SSESpecification":{
+          "shape":"SSESpecification",
+          "documentation":"<p>The new server-side encryption settings for the specified table.</p>"
         }
       },
       "documentation":"<p>Represents the input of an <code>UpdateTable</code> operation.</p>"