Skip to content

Commit

Permalink
Merge branch 'release-1.3.18' into develop
Browse files Browse the repository at this point in the history
* release-1.3.18:
  Bumping version to 1.3.18
  Update changelog with latest changes
  • Loading branch information
jamesls committed Jun 19, 2014
2 parents 2506b29 + 88be85e commit 5a1d49b
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
16 changes: 14 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@
CHANGELOG
=========

Next Release (TBD)
==================
1.3.18
======

* feature:``aws configure``: Add support for setting nested attributes
(`issue 817 <https://github.com/aws/aws-cli/pull/817>`__)
* bugfix:``aws s3``: Fix issue when uploading large files to newly
created buckets in a non-standard region
(`issue 634 <https://github.com/aws/aws-cli/issues/634>`__)
* feature:``aws dynamodb``: Add support for a ``local`` region for
dynamodb (``aws dynamodb --region local ...``)
(`issue 608 <https://github.com/aws/aws-cli/issues/608>`__)
* feature:``aws elasticbeanstalk``: Update ``aws elasticbeanstalk``
model to the latest version
* feature:Documentation Examples: Add more documentatoin examples for many
AWS CLI commands
* feature:``aws emr``: Update model to the latest version
* feature:``aws elastictranscoder:`` Update model to the latest version


1.3.17
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.17'
__version__ = '1.3.18'

#
# 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.17'
release = '1.3.18'

# 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.51.0,<0.52.0',
requires = ['botocore>=0.52.0,<0.53.0',
'bcdoc>=0.12.0,<0.13.0',
'six>=1.1.0',
'colorama==0.2.5',
Expand Down

0 comments on commit 5a1d49b

Please sign in to comment.