Merge branch 'release-1.3.21' into develop

* release-1.3.21: Bumping version to 1.3.21
aws · Jul 1, 2014 · cfd619f · cfd619f
2 parents f8cacf7 + 69fbea5
commit cfd619f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,8 +2,8 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.3.21
+======
 
 * feature:``aws opsworks``: Update the ``aws opsworks`` command
   to the latest version

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

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.3.'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.20'
+release = '1.3.21'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 import awscli
 
 
-requires = ['botocore>=0.54.0,<0.55.0',
+requires = ['botocore>=0.55.0,<0.56.0',
             'bcdoc>=0.12.0,<0.13.0',
             'six>=1.1.0',
             'colorama==0.2.5',