Merge branch 'release-1.6.0'

* release-1.6.0:
  Bumping version to 1.6.0
  Update changelog
  Fix filter bug
  Add assumerole/waiters to the config file
  Fix formatting (pep8)
  Update waiters to use the new get_waiter_model
  Update waiter code based on feedback
  Expose waiters in the CLI
  Add support for MFA when assuming a role
  Fix integ test failure
  Remove commented out code
  Initial commit of assume role cred provider
  Add #986 to the changelog

CHANGELOG.rst

@@ -2,6 +2,27 @@
 CHANGELOG
 =========
 
+1.6.0
+=====
+
+* feature:AssumeRole Credential Provider: Add support for assuming a role
+  by configuring a ``role_arn`` and a ``source_profile`` in the AWS
+  config file
+  (`issue 991 <https://github.com/aws/aws-cli/pull/991>`__,
+   `issue 990 <https://github.com/aws/aws-cli/pull/990>`__)
+* feature:Waiters: Add a ``wait`` subcommand that allows for a command
+  to block until an AWS resource reaches a given state
+  (`issue 992 <https://github.com/aws/aws-cli/pull/992>`__,
+   `issue 985 <https://github.com/aws/aws-cli/pull/985>`__)
+* bugfix:``aws s3``: Fix issue where request was not properly signed
+  on retried requests for ``aws s3``
+  (`issue 986 <https://github.com/aws/aws-cli/issues/986>`__,
+   `botocore issue 375 <https://github.com/boto/botocore/pull/375>`__)
+* bugfix:``aws s3``: Fix issue where ``--exclude`` and ``--include`` were
+  not being properly applied when a s3 prefix was provided.
+  (`issue 993 <https://github.com/aws/aws-cli/pull/993>`__)
+
+
 1.5.6
 =====
 

awscli/__init__.py

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

awscli/clidocs.py

@@ -232,7 +232,16 @@ def doc_subitems_start(self, help_command, **kwargs):
 
     def doc_subitem(self, command_name, help_command, **kwargs):
         doc = help_command.doc
-        doc.style.tocitem(command_name)
+        subcommand = help_command.command_table[command_name]
+        subcommand_table = getattr(subcommand, 'subcommand_table', {})
+        # If the subcommand table has commands in it,
+        # direct the subitem to the command's index because
+        # it has more subcommands to be documented.
+        if (len(subcommand_table) > 0):
+            file_name = '%s/index' % command_name
+            doc.style.tocitem(command_name, file_name=file_name)
+        else:
+            doc.style.tocitem(command_name)
 
 
 class OperationDocumentEventHandler(CLIDocumentEventHandler):

awscli/clidriver.py

@@ -117,7 +117,8 @@ def _build_command_table(self):
         command_table = self._build_builtin_commands(self.session)
         self.session.emit('building-command-table.main',
                           command_table=command_table,
-                          session=self.session)
+                          session=self.session,
+                          command_object=self)
         return command_table
 
     def _build_builtin_commands(self, session):
@@ -334,6 +335,10 @@ def name(self):
     def name(self, value):
         self._name = value
 
+    @property
+    def service_object(self):
+        return self._service_object
+
     def _get_command_table(self):
         if self._command_table is None:
             self._command_table = self._create_command_table()
@@ -366,7 +371,8 @@ def _create_command_table(self):
                 service_object=service_object)
         self.session.emit('building-command-table.%s' % self._name,
                           command_table=command_table,
-                          session=self.session)
+                          session=self.session,
+                          command_object=self)
         return command_table
 
     def create_help_command(self):