Skip to content

Commit

Permalink
Merge branch 'release-1.10.32' into develop
Browse files Browse the repository at this point in the history
* release-1.10.32:
  Bumping version to 1.10.32
  Update changelog based on model updates
  • Loading branch information
AWS committed May 19, 2016
2 parents d7c035a + 518a3ef commit 529ea24
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 9 deletions.
22 changes: 22 additions & 0 deletions .changes/1.10.32.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``firehose``",
"description": "Update firehose command to latest version",
"type": "feature"
},
{
"category": "Table",
"description": "Fix rendering of tables with double-width characters.",
"type": "bugfix"
},
{
"category": "``ec2``",
"description": "Update ec2 command to latest version",
"type": "feature"
},
{
"category": "``ecs``",
"description": "Update ecs command to latest version",
"type": "feature"
}
]
5 changes: 0 additions & 5 deletions .changes/next-release/bugfix-Table.json

This file was deleted.

9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@
CHANGELOG
=========

1.10.32
=======

* feature:``firehose``: Update firehose command to latest version
* bugfix:Table: Fix rendering of tables with double-width characters.
* feature:``ec2``: Update ec2 command to latest version
* feature:``ecs``: Update ecs command to latest version


1.10.31
=======

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.10.31'
__version__ = '1.10.32'

#
# 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.10.'
# The full version, including alpha/beta/rc tags.
release = '1.10.31'
release = '1.10.32'

# 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.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ universal = 1

[metadata]
requires-dist =
botocore==1.4.21
botocore==1.4.22
colorama>=0.2.5,<=0.3.3
docutils>=0.10
rsa>=3.1.2,<=3.3.0
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==1.4.21',
requires = ['botocore==1.4.22',
'colorama>=0.2.5,<=0.3.3',
'docutils>=0.10',
'rsa>=3.1.2,<=3.3.0',
Expand Down

0 comments on commit 529ea24

Please sign in to comment.