Merge branch 'release-1.11.125'

* release-1.11.125:
  Bumping version to 1.11.125
  Disable paramfile for template-url
  Update changelog based on model updates
  Mention trickle in S3 config docs
  Clarify presign region requirements

.changes/1.11.125.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``clouddirectory``", 
+    "description": "Update clouddirectory command to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``cloudformation``", 
+    "description": "Update cloudformation command to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.11.125
+========
+
+* api-change:``clouddirectory``: Update clouddirectory command to latest version
+* api-change:``cloudformation``: Update cloudformation command to latest version
+
+
 1.11.124
 ========
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.11.124'
+__version__ = '1.11.125'
 
 #
 # Get our data path to be added to botocore's search path

awscli/customizations/s3/subcommands.py

@@ -634,9 +634,12 @@ def _get_bucket_name(self, path):
 
 class PresignCommand(S3Command):
     NAME = 'presign'
-    DESCRIPTION = ("Generate a pre-signed URL for an Amazon S3 object. "
-                   "This allows anyone who receives the pre-signed URL "
-                   "to retrieve the S3 object with an HTTP GET request.")
+    DESCRIPTION = (
+        "Generate a pre-signed URL for an Amazon S3 object. This allows "
+        "anyone who receives the pre-signed URL to retrieve the S3 object "
+        "with an HTTP GET request. For sigv4 requests the region needs to be "
+        "configured explicitly."
+    )
     USAGE = "<S3Uri>"
     ARG_TABLE = [{'name': 'path',
                   'positional_arg': True, 'synopsis': USAGE},

awscli/paramfile.py

@@ -29,6 +29,8 @@
     'apigateway.put-integration.uri',
     'cloudformation.create-stack.template-url',
     'cloudformation.update-stack.template-url',
+    'cloudformation.create-stack-set.template-url',
+    'cloudformation.update-stack-set.template-url',
     'cloudformation.create-change-set.template-url',
     'cloudformation.validate-template.template-url',
     'cloudformation.estimate-template-cost.template-url',

awscli/topics/s3-config.rst

@@ -98,7 +98,8 @@ You may need to change this value for a few reasons:
   requests can overwhelm a system.  This may cause connection timeouts or
   slow the responsiveness of the system.  Lowering this value will make the
   S3 transfer commands less resource intensive.  The tradeoff is that
-  S3 transfers may take longer to complete.
+  S3 transfers may take longer to complete. Lowering this value may be
+  necessary if using a tool such as ``trickle`` to limit bandwidth.
 * Increasing this value - In some scenarios, you may want the S3 transfers
   to complete as quickly as possible, using as much network bandwidth
   as necessary.  In this scenario, the default number of concurrent requests

doc/source/conf.py

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

setup.cfg

@@ -4,7 +4,7 @@ universal = 1
 
 [metadata]
 requires-dist =
-        botocore==1.5.87
+        botocore==1.5.88
         colorama>=0.2.5,<=0.3.7
         docutils>=0.10
         rsa>=3.1.2,<=3.5.0

setup.py

@@ -23,7 +23,7 @@ def find_version(*file_paths):
     raise RuntimeError("Unable to find version string.")
 
 
-requires = ['botocore==1.5.87',
+requires = ['botocore==1.5.88',
             'colorama>=0.2.5,<=0.3.7',
             'docutils>=0.10',
             'rsa>=3.1.2,<=3.5.0',