Updates SDK to v2.502.0

.changes/2.502.0.json

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

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog for AWS SDK for JavaScript
-<!--LATEST=2.501.0-->
+<!--LATEST=2.502.0-->
 <!--ENTRYINSERT-->
 
+## 2.502.0
+* feature: CodeCommit: This release supports better exception handling for merges.
+
 ## 2.501.0
 * feature: Batch: AWS Batch now supports SDK auto-pagination and Job-level docker devices.
 * feature: CloudWatchLogs: Allow for specifying multiple log groups in an Insights query, and deprecate storedByte field for LogStreams and interleaved field for FilterLogEventsRequest.

README.md

@@ -25,7 +25,7 @@ version.
 To use the SDK in the browser, simply add the following script tag to your
 HTML pages:
 
-    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.501.0.min.js"></script>
+    <script src="https://sdk.amazonaws.com/js/aws-sdk-2.502.0.min.js"></script>
 
 You can also build a custom browser SDK with your specified set of AWS services.
 This can allow you to reduce the SDK's size, specify different API versions of

apis/codecommit-2015-04-13.normal.json

@@ -554,6 +554,9 @@
         {
           "shape": "MaximumItemsToCompareExceededException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "FileModeRequiredException"
         },
@@ -1924,6 +1927,9 @@
         {
           "shape": "ManualMergeRequiredException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "EncryptionIntegrityChecksFailedException"
         },
@@ -2054,6 +2060,9 @@
         {
           "shape": "CommitMessageLengthExceededException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "EncryptionIntegrityChecksFailedException"
         },
@@ -2124,6 +2133,9 @@
         {
           "shape": "ManualMergeRequiredException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "InvalidConflictDetailLevelException"
         },
@@ -2251,6 +2263,9 @@
         {
           "shape": "RepositoryDoesNotExistException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "EncryptionIntegrityChecksFailedException"
         },
@@ -2339,6 +2354,9 @@
         {
           "shape": "MaximumConflictResolutionEntriesExceededException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "PathRequiredException"
         },
@@ -2499,6 +2517,9 @@
         {
           "shape": "RepositoryNotAssociatedWithPullRequestException"
         },
+        {
+          "shape": "ConcurrentReferenceUpdateException"
+        },
         {
           "shape": "EncryptionIntegrityChecksFailedException"
         },
@@ -6549,19 +6570,19 @@
         },
         "destinationArn": {
           "shape": "Arn",
-          "documentation": "<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>"
+          "documentation": "<p>The ARN of the resource that is the target for a trigger. For example, the ARN of a topic in Amazon SNS.</p>"
         },
         "customData": {
           "shape": "RepositoryTriggerCustomData",
           "documentation": "<p>Any custom data associated with the trigger that will be included in the information sent to the target of the trigger.</p>"
         },
         "branches": {
           "shape": "BranchNameList",
-          "documentation": "<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>"
+          "documentation": "<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>"
         },
         "events": {
           "shape": "RepositoryTriggerEventList",
-          "documentation": "<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>"
+          "documentation": "<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>"
         }
       },
       "documentation": "<p>Information about a trigger for a repository.</p>"

clients/codecommit.d.ts

@@ -2637,19 +2637,19 @@ declare namespace CodeCommit {
      */
     name: RepositoryTriggerName;
     /**
-     * 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).
+     * The ARN of the resource that is the target for a trigger. For example, the ARN of a topic in Amazon SNS.
      */
     destinationArn: Arn;
     /**
      * Any custom data associated with the trigger that will be included in the information sent to the target of the trigger.
      */
     customData?: RepositoryTriggerCustomData;
     /**
-     * The branches that will be included in the trigger configuration. If you specify an empty array, the trigger will apply to all branches.  While no content is required in the array, you must include the array itself. 
+     * The branches that will be included in the trigger configuration. If you specify an empty array, the trigger will apply to all branches.  Although no content is required in the array, you must include the array itself. 
      */
     branches?: BranchNameList;
     /**
-     * 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).   The valid value "all" cannot be used with any other values. 
+     * The repository events that will cause the trigger to run actions in another service, such as sending a notification through Amazon SNS.   The valid value "all" cannot be used with any other values. 
      */
     events: RepositoryTriggerEventList;
   }

dist/aws-sdk-core-react-native.js

@@ -83,7 +83,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  /**
 	   * @constant
 	   */
-	  VERSION: '2.501.0',
+	  VERSION: '2.502.0',
 
 	  /**
 	   * @api private

dist/aws-sdk-react-native.js

@@ -395,7 +395,7 @@ return /******/ (function(modules) { // webpackBootstrap
 		  /**
 		   * @constant
 		   */
-		  VERSION: '2.501.0',
+		  VERSION: '2.502.0',
 
 		  /**
 		   * @api private

dist/aws-sdk.js

@@ -1,4 +1,4 @@
-// AWS SDK for JavaScript v2.501.0
+// AWS SDK for JavaScript v2.502.0
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // License at https://sdk.amazonaws.com/js/BUNDLE_LICENSE.txt
 (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
@@ -167842,7 +167842,7 @@ AWS.util.update(AWS, {
   /**
    * @constant
    */
-  VERSION: '2.501.0',
+  VERSION: '2.502.0',
 
   /**
    * @api private
@@ -188312,7 +188312,7 @@ var LRUCache = /** @class */ (function () {
 }());
 exports.LRUCache = LRUCache;
 },{}],410:[function(require,module,exports){
-// AWS SDK for JavaScript v2.501.0
+// AWS SDK for JavaScript v2.502.0
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // License at https://sdk.amazonaws.com/js/BUNDLE_LICENSE.txt
 require('./browser_loader');

lib/core.js

@@ -20,7 +20,7 @@ AWS.util.update(AWS, {
   /**
    * @constant
    */
-  VERSION: '2.501.0',
+  VERSION: '2.502.0',
 
   /**
    * @api private

package.json

@@ -1,7 +1,7 @@
 {
   "name": "aws-sdk",
   "description": "AWS SDK for JavaScript",
-  "version": "2.501.0",
+  "version": "2.502.0",
   "author": {
     "name": "Amazon Web Services",
     "email": "",