Merge branch 'release-1.7.34' into develop

* release-1.7.34: Bumping version to 1.7.34 Update changelog with bugfixes
swipely · Jun 12, 2015 · 52249aa · 52249aa
2 parents 7f7cee9 + eb809e2
commit 52249aa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.7.34
+=======
+
+* bugfix:Installation: Fix bundled installer when running
+  python 2.6
+  (`issue 1381 https://github.com/aws/aws-cli/pull/1381`)
+* bugfix:Installation: Fix minimum required version of pip
+  to install the AWS CLI using python2.6
+  (`issue 1383 https://github.com/aws/aws-cli/pull/1382`)
+
+
 1.7.33
 ======
 

diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.7.33'
+__version__ = '1.7.34'
 
 #
 # 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.33'
+release = '1.7.34'
 
 # 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==1.0.0b2',
+requires = ['botocore==1.0.0b3',
             'bcdoc>=0.16.0,<0.17.0',
             'colorama>=0.2.5,<=0.3.3',
             'docutils>=0.10',