Merge branch 'release-1.7.15' into develop

* release-1.7.15:
  Bumping version to 1.7.15
  Update Changelog with bugfixes and features
  Improved docs for ICMP port ranges
  Add debug log that records initial CLI input

CHANGELOG.rst

@@ -2,9 +2,14 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.7.15
+======
 
+* feature:``aws elastictranscoder``: Add support for Applied Color
+  SpaceConversion.
+* bugfix:``aws --profile``: Fix issue where explicitly specifying profile
+  did not override credential environment variables.
+  (`botocore issue 486 <https://github.com/boto/botocore/pull/486>`__)
 * bugfix:``aws datapipeline list-runs``: Fix issue with
   ``--schedule-interval`` parameter.
   (`issue 1225 <https://github.com/aws/aws-cli/pull/1225>`__)

awscli/__init__.py

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

awscli/clidriver.py

@@ -232,6 +232,8 @@ def _handle_top_level_args(self, args):
             LOG.debug("CLI version: %s, botocore version: %s",
                       self.session.user_agent(),
                       botocore_version)
+            LOG.debug("Arguments entered to CLI: %s", sys.argv[1:])
+
         else:
             self.session.set_stream_logger(logger_name='awscli',
                                            log_level=logging.ERROR)

awscli/customizations/ec2secgroupsimplify.py

@@ -98,9 +98,13 @@ def _add_docs(help_command, **kwargs):
                  '<p>Valid protocol values: <code>tcp</code>, '
                  '<code>udp</code>, <code>icmp</code></p>')
 PORT_DOCS = ('<p>For TCP or UDP: The range of ports to allow.'
-             '  A single integer or a range (min-max). A value of '
-             '<code>-1</code> indicates all ICMP codes for the '
-             'specified ICMP type.</p>')
+             '  A single integer or a range (<code>min-max</code>).</p>'
+             '<p>For ICMP: A single integer or a range (<code>type-code</code>)'
+             ' representing the ICMP type'
+             ' number and the ICMP code number respectively.'
+             ' A value of -1 indicates all ICMP codes for'
+             ' all ICMP types. A value of -1 just for <code>type</code>'
+             ' indicates all ICMP codes for the specified ICMP type.</p>')
 CIDR_DOCS = '<p>The CIDR IP range.</p>'
 SOURCEGROUP_DOCS = ('<p>The name or ID of the source security group. '
                     'Cannot be used when specifying a CIDR IP address.')

doc/source/conf.py

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

setup.py

@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.95.0,<0.96.0',
+requires = ['botocore>=0.96.0,<0.97.0',
             'bcdoc>=0.13.0,<0.14.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',