Update models for release

.changes/3.108.1

@@ -0,0 +1,7 @@
+[
+    {
+        "type": "api-change",
+        "category": "CodeCommit",
+        "description": "This release supports better exception handling for merges."
+    }
+]

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## next release
+
+* `Aws\CodeCommit` - This release supports better exception handling for merges.
+
 ## 3.108.0 - 2019-07-26
 
 * `Aws\Batch` - AWS Batch now supports SDK auto-pagination and Job-level docker devices.

src/data/codecommit/2015-04-13/api-2.json

@@ -232,6 +232,7 @@
         {"shape":"FolderContentSizeLimitExceededException"},
         {"shape":"MaximumFileContentToLoadExceededException"},
         {"shape":"MaximumItemsToCompareExceededException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"FileModeRequiredException"},
         {"shape":"InvalidFileModeException"},
         {"shape":"NameLengthExceededException"},
@@ -836,6 +837,7 @@
         {"shape":"BranchNameIsTagNameException"},
         {"shape":"BranchDoesNotExistException"},
         {"shape":"ManualMergeRequiredException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -885,6 +887,7 @@
         {"shape":"NameLengthExceededException"},
         {"shape":"InvalidEmailException"},
         {"shape":"CommitMessageLengthExceededException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -914,6 +917,7 @@
         {"shape":"BranchNameIsTagNameException"},
         {"shape":"BranchDoesNotExistException"},
         {"shape":"ManualMergeRequiredException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"InvalidConflictDetailLevelException"},
         {"shape":"InvalidConflictResolutionStrategyException"},
         {"shape":"InvalidConflictResolutionException"},
@@ -962,6 +966,7 @@
         {"shape":"RepositoryNameRequiredException"},
         {"shape":"InvalidRepositoryNameException"},
         {"shape":"RepositoryDoesNotExistException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -997,6 +1002,7 @@
         {"shape":"MultipleConflictResolutionEntriesException"},
         {"shape":"ReplacementContentRequiredException"},
         {"shape":"MaximumConflictResolutionEntriesExceededException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"PathRequiredException"},
         {"shape":"InvalidPathException"},
         {"shape":"InvalidFileModeException"},
@@ -1056,6 +1062,7 @@
         {"shape":"InvalidRepositoryNameException"},
         {"shape":"RepositoryDoesNotExistException"},
         {"shape":"RepositoryNotAssociatedWithPullRequestException"},
+        {"shape":"ConcurrentReferenceUpdateException"},
         {"shape":"EncryptionIntegrityChecksFailedException"},
         {"shape":"EncryptionKeyAccessDeniedException"},
         {"shape":"EncryptionKeyDisabledException"},
@@ -1728,6 +1735,12 @@
       },
       "exception":true
     },
+    "ConcurrentReferenceUpdateException":{
+      "type":"structure",
+      "members":{
+      },
+      "exception":true
+    },
     "Conflict":{
       "type":"structure",
       "members":{

src/data/codecommit/2015-04-13/docs-2.json

@@ -84,7 +84,7 @@
         "PullRequest$authorArn": "<p>The Amazon Resource Name (ARN) of the user who created the pull request.</p>",
         "PullRequestEvent$actorArn": "<p>The Amazon Resource Name (ARN) of the user whose actions resulted in the event. Examples include updating the pull request with additional commits or changing the status of a pull request.</p>",
         "RepositoryMetadata$Arn": "<p>The Amazon Resource Name (ARN) of the repository.</p>",
-        "RepositoryTrigger$destinationArn": "<p>The ARN of the resource that is the target for a trigger. For example, the ARN of a topic in Amazon Simple Notification Service (SNS).</p>"
+        "RepositoryTrigger$destinationArn": "<p>The ARN of the resource that is the target for a trigger. For example, the ARN of a topic in Amazon SNS.</p>"
       }
     },
     "AuthorDoesNotExistException": {
@@ -190,7 +190,7 @@
       "base": null,
       "refs": {
         "ListBranchesOutput$branches": "<p>The list of branch names.</p>",
-        "RepositoryTrigger$branches": "<p>The branches that will be included in the trigger configuration. If you specify an empty array, the trigger will apply to all branches.</p> <note> <p>While no content is required in the array, you must include the array itself.</p> </note>"
+        "RepositoryTrigger$branches": "<p>The branches that will be included in the trigger configuration. If you specify an empty array, the trigger will apply to all branches.</p> <note> <p>Although no content is required in the array, you must include the array itself.</p> </note>"
       }
     },
     "BranchNameRequiredException": {
@@ -420,6 +420,11 @@
       "refs": {
       }
     },
+    "ConcurrentReferenceUpdateException": {
+      "base": "<p>The merge cannot be completed because the target branch has been modified. Another user might have modified the target branch while the merge was in progress. Wait a few minutes, and then try again.</p>",
+      "refs": {
+      }
+    },
     "Conflict": {
       "base": "<p>Information about conflicts in a merge operation.</p>",
       "refs": {
@@ -2255,7 +2260,7 @@
     "RepositoryTriggerEventList": {
       "base": null,
       "refs": {
-        "RepositoryTrigger$events": "<p>The repository events that will cause the trigger to run actions in another service, such as sending a notification through Amazon Simple Notification Service (SNS). </p> <note> <p>The valid value \"all\" cannot be used with any other values.</p> </note>"
+        "RepositoryTrigger$events": "<p>The repository events that will cause the trigger to run actions in another service, such as sending a notification through Amazon SNS. </p> <note> <p>The valid value \"all\" cannot be used with any other values.</p> </note>"
       }
     },
     "RepositoryTriggerEventsListRequiredException": {