Merge branch 'release-1.4.2' into develop

* release-1.4.2: Bumping version to 1.4.2 Updated the changelog for new features.
aws · Aug 14, 2014 · 09bbb5e · 09bbb5e
2 parents 46d5acd + a53bfa3
commit 09bbb5e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,9 +2,10 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.4.2
+=====
 
+* feature:``aws cloudsearchdomain``: Added sigv4 support.
 * bugfix:Credentials: Raise an error if an incomplete profile is found
   (`issue 690 <https://github.com/aws/aws-cli/issues/690>`__)
 * feature:Signing Requests: Add a ``--no-sign-request`` option that,

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 #
 # 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.4'
 # The full version, including alpha/beta/rc tags.
-release = '1.4.1'
+release = '1.4.2'
 
 # 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.61.0,<0.62.0',
+requires = ['botocore>=0.62.0,<0.63.0',
             'bcdoc>=0.12.0,<0.13.0',
             'six>=1.1.0',
             'colorama==0.2.5',