Skip to content

Commit

Permalink
Merge branch 'release-1.3.24'
Browse files Browse the repository at this point in the history
* release-1.3.24:
  Bumping version to 1.3.24
  Update changelog
  Update changelog with latest changes
  Add boto/botocore#324 to changelog
  • Loading branch information
danielgtaylor committed Jul 24, 2014
2 parents 7526a9d + 849d3f1 commit a2100bb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@ CHANGELOG
=========


1.3.24
======

* feature:``aws elasticloadbalancing``: Update to the latest service model.
* bugfix:``aws swf poll-for-decision-task``: Fix issue where
the default paginated response is missing output response keys
(`issue botocore 324 <https://github.com/boto/botocore/pull/324>`__)
* bugfix:Connections: Fix issue where connections were hanging
when network issues occurred
`issue botocore 325 <https://github.com/boto/botocore/pull/325>`__)
* bugfix:``aws s3/s3api``: Fix issue where Deprecations were being
written to stderr in Python 3.4.1
`issue botocore 319 <https://github.com/boto/botocore/issues/319>`__)


1.3.23
======

Expand Down
2 changes: 1 addition & 1 deletion awscli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"""
import os

__version__ = '1.3.23'
__version__ = '1.3.24'

#
# Get our data path to be added to botocore's search path
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# The short X.Y version.
version = '1.3.'
# The full version, including alpha/beta/rc tags.
release = '1.3.23'
release = '1.3.24'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import awscli


requires = ['botocore>=0.57.0,<0.58.0',
requires = ['botocore>=0.58.0,<0.59.0',
'bcdoc>=0.12.0,<0.13.0',
'six>=1.1.0',
'colorama==0.2.5',
Expand Down

0 comments on commit a2100bb

Please sign in to comment.