Merge branch 'release-1.7.27'

* release-1.7.27: Bumping version to 1.7.27 Update Changelog and tests Update css for html doc generation Update --max-items documentation
tangaowei · May 14, 2015 · d1d13ed · d1d13ed
2 parents 0ae23ad + 4ce7f51
commit d1d13ed
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,15 @@
 CHANGELOG
 =========
 
+1.7.27
+======
+
+* feature:``aws ds``: Add support for AWS Directory Service.
+* feature:``aws ec2``: Add support for VPC endpoints for Amazon S3.
+* feature:``aws ec2``: Add support for EIP Migration.
+* feature:``aws logs``: Add support for filtering log events.
+
+
 1.7.26
 ======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.7.26'
+__version__ = '1.7.27'
 
 #
 # Get our data path to be added to botocore's search path

diff --git a/awscli/customizations/paginate.py b/awscli/customizations/paginate.py
@@ -46,6 +46,8 @@
 of items available is more than the value specified in
 max-items then a <code>NextToken</code> will
 be provided in the output that you can use to resume pagination.
+This <code>NextToken</code> response element should <b>not</b> be
+used directly outside of the AWS CLI.</p>
 """
 
 PAGE_SIZE_HELP = """

diff --git a/doc/source/conf.py b/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.26'
+release = '1.7.27'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/static/bootstrap.min.css b/doc/source/guzzle_sphinx_theme/guzzle_sphinx_theme/static/bootstrap.min.css
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.107.0,<0.108.0',
+requires = ['botocore>=0.108.0,<0.109.0',
             'bcdoc>=0.14.0,<0.15.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',

diff --git a/tests/unit/test_completer.py b/tests/unit/test_completer.py
@@ -32,8 +32,8 @@
                       'cloudsearch', 'cloudsearchdomain', 'cloudtrail',
                       'cloudwatch', 'cognito-identity', 'cognito-sync',
                       'configservice', 'configure', 'datapipeline', 'deploy',
-                      'directconnect', 'dynamodb', 'glacier', 'ec2', 'ecs',
-                      'elasticache', 'elasticbeanstalk',
+                      'directconnect', 'ds', 'dynamodb', 'glacier', 'ec2',
+                      'ecs', 'elasticache', 'elasticbeanstalk',
                       'elastictranscoder', 'elb', 'emr', 'iam',
                       'importexport', 'kinesis', 'kms', 'lambda', 'logs',
                       'machinelearning', 'opsworks', 'rds', 'redshift',