From 8f5f21f90040cbadd668a98e9d227705427821f6 Mon Sep 17 00:00:00 2001 From: AWS Date: Thu, 19 May 2016 19:08:39 +0000 Subject: [PATCH 1/2] Update changelog based on model updates --- .changes/next-release/feature-ec2.json | 5 +++++ .changes/next-release/feature-ecs.json | 5 +++++ .changes/next-release/feature-firehose.json | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 .changes/next-release/feature-ec2.json create mode 100644 .changes/next-release/feature-ecs.json create mode 100644 .changes/next-release/feature-firehose.json diff --git a/.changes/next-release/feature-ec2.json b/.changes/next-release/feature-ec2.json new file mode 100644 index 000000000000..78c00f873dd4 --- /dev/null +++ b/.changes/next-release/feature-ec2.json @@ -0,0 +1,5 @@ +{ + "category": "``ec2``", + "type": "feature", + "description": "Update ec2 command to latest version" +} diff --git a/.changes/next-release/feature-ecs.json b/.changes/next-release/feature-ecs.json new file mode 100644 index 000000000000..49d5a6c431d2 --- /dev/null +++ b/.changes/next-release/feature-ecs.json @@ -0,0 +1,5 @@ +{ + "category": "``ecs``", + "type": "feature", + "description": "Update ecs command to latest version" +} diff --git a/.changes/next-release/feature-firehose.json b/.changes/next-release/feature-firehose.json new file mode 100644 index 000000000000..c5fdc9c835ee --- /dev/null +++ b/.changes/next-release/feature-firehose.json @@ -0,0 +1,5 @@ +{ + "category": "``firehose``", + "type": "feature", + "description": "Update firehose command to latest version" +} From 518a3ef24c5734136424792d3b10c1d4979bcec0 Mon Sep 17 00:00:00 2001 From: AWS Date: Thu, 19 May 2016 19:11:47 +0000 Subject: [PATCH 2/2] Bumping version to 1.10.32 --- .changes/1.10.32.json | 22 +++++++++++++++++++++ .changes/next-release/bugfix-Table.json | 5 ----- .changes/next-release/feature-ec2.json | 5 ----- .changes/next-release/feature-ecs.json | 5 ----- .changes/next-release/feature-firehose.json | 5 ----- CHANGELOG.rst | 9 +++++++++ awscli/__init__.py | 2 +- doc/source/conf.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 10 files changed, 35 insertions(+), 24 deletions(-) create mode 100644 .changes/1.10.32.json delete mode 100644 .changes/next-release/bugfix-Table.json delete mode 100644 .changes/next-release/feature-ec2.json delete mode 100644 .changes/next-release/feature-ecs.json delete mode 100644 .changes/next-release/feature-firehose.json diff --git a/.changes/1.10.32.json b/.changes/1.10.32.json new file mode 100644 index 000000000000..c67e17b3a6f9 --- /dev/null +++ b/.changes/1.10.32.json @@ -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" + } +] \ No newline at end of file diff --git a/.changes/next-release/bugfix-Table.json b/.changes/next-release/bugfix-Table.json deleted file mode 100644 index ac7466c65a70..000000000000 --- a/.changes/next-release/bugfix-Table.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "description": "Fix rendering of tables with double-width characters.", - "type": "bugfix", - "category": "Table" -} diff --git a/.changes/next-release/feature-ec2.json b/.changes/next-release/feature-ec2.json deleted file mode 100644 index 78c00f873dd4..000000000000 --- a/.changes/next-release/feature-ec2.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category": "``ec2``", - "type": "feature", - "description": "Update ec2 command to latest version" -} diff --git a/.changes/next-release/feature-ecs.json b/.changes/next-release/feature-ecs.json deleted file mode 100644 index 49d5a6c431d2..000000000000 --- a/.changes/next-release/feature-ecs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category": "``ecs``", - "type": "feature", - "description": "Update ecs command to latest version" -} diff --git a/.changes/next-release/feature-firehose.json b/.changes/next-release/feature-firehose.json deleted file mode 100644 index c5fdc9c835ee..000000000000 --- a/.changes/next-release/feature-firehose.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "category": "``firehose``", - "type": "feature", - "description": "Update firehose command to latest version" -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a4a1d754c798..d8c98a6eeb51 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -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 ======= diff --git a/awscli/__init__.py b/awscli/__init__.py index 5efddc3a1ffc..93d64e6fb835 100644 --- a/awscli/__init__.py +++ b/awscli/__init__.py @@ -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 diff --git a/doc/source/conf.py b/doc/source/conf.py index 109b913aaa67..a761c7143c38 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -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. diff --git a/setup.cfg b/setup.cfg index 80e84078e1d2..f95fb2bf463c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 diff --git a/setup.py b/setup.py index 1bb72cc7e0e5..84a5bd1451d4 100644 --- a/setup.py +++ b/setup.py @@ -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',