Merge branch 'release-1.7.13' into develop

* release-1.7.13: Bumping version to 1.7.13 Update changelog with the latest features
aws · Mar 5, 2015 · 186a11f · 186a11f
2 parents eeb5fff + a2e37b2
commit 186a11f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,9 +2,16 @@
 CHANGELOG
 =========
 
-Next Release (TBD)
-==================
+1.7.13
+======
 
+* feature:``aws cloudsearch``: Update ``aws cloudsearch`` command
+  to the latest model
+* feature:``aws cognito-sync``:  Update ``aws cognito-sync`` command
+  to allow customers to receive near-realtime updates
+  as their data changes as well as exporting historical data. Customers
+  configure an Amazon Kinesis stream to receive the data which can then be
+  processed and exported to other data stores such as Amazon Redshift.
 * bugfix:``aws opsworks``: Fix issue with platform detection on
   linux systems with python3.3 and higher
   (`issue 1199 <https://github.com/aws/aws-cli/pull/1199>`__)

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.7.12'
+__version__ = '1.7.13'
 
 #
 # 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.7.'
 # The full version, including alpha/beta/rc tags.
-release = '1.7.12'
+release = '1.7.13'
 
 # 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.93.0,<0.94.0',
+requires = ['botocore>=0.94.0,<0.95.0',
             'bcdoc>=0.13.0,<0.14.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',